Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

lua: Move to lua 5.4 and include by default v4 #10255

Closed
wants to merge 6 commits into from
Closed

lua: Move to lua 5.4 and include by default v4 #10255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d9f70ef
lua: require lua 5.4
J0eJ0h Jan 11, 2024
a0160d7
lua: Remove luajit support
J0eJ0h Jan 12, 2024
8c1a98a
github-ci: Disable lua in debian 10
J0eJ0h Jan 12, 2024
e166146
lua: build lua by default
J0eJ0h Jan 16, 2024
616c12d
github-ci: Handle switch to lua by default
J0eJ0h Jan 16, 2024
84ff5fb
github-ci: Fix CI checks that only run on PR
J0eJ0h Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 22 additions & 17 deletions .github/workflows/builds.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ jobs:
CFLAGS="${DEFAULT_CFLAGS}" ./configure
- run: make -j2 distcheck
env:
DISTCHECK_CONFIGURE_FLAGS: "--enable-unittests --enable-debug --enable-lua --enable-geoip --enable-profiling --enable-profiling-locks --enable-dpdk"
DISTCHECK_CONFIGURE_FLAGS: "--enable-unittests --enable-debug --enable-geoip --enable-profiling --enable-profiling-locks --enable-dpdk"
- run: test -e doc/userguide/suricata.1
- name: Checking includes
run: |
Expand Down Expand Up @@ -914,7 +914,7 @@ jobs:
# Set the concurrency level for cocci.
run: CONCURRENCY_LEVEL=2 make check
- run: make distclean
- run: CC="clang" CFLAGS="$DEFAULT_CFLAGS -Wshadow -fsanitize=address -fno-omit-frame-pointer" ./configure --enable-debug --enable-unittests --disable-shared --enable-rust-strict --enable-hiredis --enable-nfqueue --enable-lua
- run: CC="clang" CFLAGS="$DEFAULT_CFLAGS -Wshadow -fsanitize=address -fno-omit-frame-pointer" ./configure --enable-debug --enable-unittests --disable-shared --enable-rust-strict --enable-hiredis --enable-nfqueue
env:
LDFLAGS: "-fsanitize=address"
ac_cv_func_realloc_0_nonnull: "yes"
Expand Down Expand Up @@ -1100,7 +1100,7 @@ jobs:
- run: tar xf prep/libhtp.tar.gz
- run: tar xf prep/suricata-update.tar.gz
- run: ./autogen.sh
- run: CC="clang" CFLAGS="$DEFAULT_CFLAGS -Wshadow -fsanitize=address -fno-omit-frame-pointer" ./configure --enable-debug --enable-unittests --disable-shared --enable-rust-strict --enable-hiredis --enable-nfqueue --enable-lua
- run: CC="clang" CFLAGS="$DEFAULT_CFLAGS -Wshadow -fsanitize=address -fno-omit-frame-pointer" ./configure --enable-debug --enable-unittests --disable-shared --enable-rust-strict --enable-hiredis --enable-nfqueue
env:
LDFLAGS: "-fsanitize=address"
ac_cv_func_realloc_0_nonnull: "yes"
Expand Down Expand Up @@ -1407,7 +1407,7 @@ jobs:
libnuma-dev \
libhiredis-dev \
libhyperscan-dev \
liblua5.1-dev \
liblua5.4-dev \
libjansson-dev \
libevent-dev \
libevent-pthreads-2.1-7 \
Expand Down Expand Up @@ -1518,14 +1518,15 @@ jobs:
libyaml-dev \
libcap-ng-dev \
libcap-ng0 \
liblua5.4-dev \
jlucovsky marked this conversation as resolved.
Show resolved Hide resolved
libmagic-dev \
libnetfilter-queue-dev \
libnetfilter-queue1 \
libnfnetlink-dev \
libnfnetlink0 \
libnuma-dev \
libhiredis-dev \
liblua5.1-dev \
liblua5.4-dev \
libjansson-dev \
libevent-dev \
libevent-pthreads-2.1-7 \
Expand Down Expand Up @@ -1559,7 +1560,7 @@ jobs:
chmod 755 $HOME/.cargo/bin/cbindgen
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- run: ./autogen.sh
- run: ./configure --with-gnu-ld --enable-fuzztargets --disable-shared --enable-gccprotect
- run: ./configure --with-gnu-ld --enable-fuzztargets --disable-shared --enable-gccprotect
env:
LIB_FUZZING_ENGINE: "fail_to_onefile_driver"
CC: "clang-14"
Expand Down Expand Up @@ -1648,7 +1649,7 @@ jobs:
chmod 755 $HOME/.cargo/bin/cbindgen
echo "$HOME/.cargo/bin" >> $GITHUB_PATH
- run: ./autogen.sh
- run: CFLAGS="$DEFAULT_CFLAGS -DNDEBUG" ./configure --enable-unittests
- run: CFLAGS="$DEFAULT_CFLAGS -DNDEBUG" ./configure --enable-unittests --disable-lua
- run: make -j2
- run: make check
- run: make dist
Expand Down Expand Up @@ -1762,6 +1763,7 @@ jobs:
libyaml-dev \
libcap-ng-dev \
libcap-ng0 \
liblua5.4-dev \
libmagic-dev \
libnetfilter-queue-dev \
libnetfilter-queue1 \
Expand Down Expand Up @@ -1841,6 +1843,7 @@ jobs:
libyaml-dev \
libcap-ng-dev \
libcap-ng0 \
liblua5.4-dev \
libmagic-dev \
libnetfilter-queue-dev \
libnetfilter-queue1 \
Expand Down Expand Up @@ -1902,6 +1905,7 @@ jobs:
libyaml-dev \
libcap-ng-dev \
libcap-ng0 \
liblua5.4-dev \
libmagic-dev \
libnetfilter-queue-dev \
libnetfilter-queue1 \
Expand Down Expand Up @@ -1995,6 +1999,7 @@ jobs:
libyaml-dev \
libcap-ng-dev \
libcap-ng0 \
liblua5.4-dev \
libmagic-dev \
libnetfilter-queue-dev \
libnetfilter-queue1 \
Expand Down Expand Up @@ -2100,7 +2105,7 @@ jobs:
libmaxminddb-dev \
libjansson-dev \
libjansson4 \
liblua5.1-dev \
liblua5.4-dev \
libnspr4-dev \
libnuma-dev \
liblz4-dev \
Expand Down Expand Up @@ -2133,7 +2138,7 @@ jobs:
# -j2 caused random failures during cargo vendor
- run: make distcheck
env:
DISTCHECK_CONFIGURE_FLAGS: "--enable-unittests --enable-debug --enable-lua --enable-geoip --enable-profiling --enable-profiling-locks --enable-dpdk"
DISTCHECK_CONFIGURE_FLAGS: "--enable-unittests --enable-debug --enable-geoip --enable-profiling --enable-profiling-locks --enable-dpdk"
- run: test -e doc/userguide/suricata.1
- run: test -e doc/userguide/userguide.pdf
- name: Building Rust documentation
Expand Down Expand Up @@ -2182,6 +2187,7 @@ jobs:
libyaml-dev \
libcap-ng-dev \
libcap-ng0 \
liblua5.4-dev \
libmagic-dev \
libjansson-dev \
libjansson4 \
Expand Down Expand Up @@ -2263,7 +2269,7 @@ jobs:
libmaxminddb-dev \
libjansson-dev \
libjansson4 \
liblua5.1-dev \
liblua5.4-dev \
libnspr4-dev \
libnuma-dev \
liblz4-dev \
Expand Down Expand Up @@ -2297,7 +2303,7 @@ jobs:
- run: tar xf prep/suricata-update.tar.gz
- run: tar xf prep/suricata-verify.tar.gz
- run: ./autogen.sh
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests --enable-debug --enable-lua --enable-geoip --enable-profiling --enable-profiling-locks --enable-dpdk
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests --enable-debug --enable-geoip --enable-profiling --enable-profiling-locks --enable-dpdk
- run: make -j2
- run: make check
- name: Building Rust documentation
Expand Down Expand Up @@ -2344,7 +2350,7 @@ jobs:
libmagic-dev \
libjansson-dev \
libgeoip-dev \
liblua5.1-dev \
liblua5.4-dev \
libhiredis-dev \
libevent-dev \
libtool \
Expand Down Expand Up @@ -2419,7 +2425,6 @@ jobs:
libmagic-dev \
libjansson-dev \
libgeoip-dev \
liblua5.1-dev \
jlucovsky marked this conversation as resolved.
Show resolved Hide resolved
libhiredis-dev \
libevent-dev \
libtool \
Expand Down Expand Up @@ -2448,7 +2453,7 @@ jobs:
cp prep/cbindgen $HOME/.cargo/bin
chmod 755 $HOME/.cargo/bin/cbindgen
- run: ./autogen.sh
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests --enable-fuzztargets
- run: CFLAGS="${DEFAULT_CFLAGS}" ./configure --enable-unittests --enable-fuzztargets --disable-lua
- run: make -j2
- run: make check
- run: tar xf prep/suricata-verify.tar.gz
Expand Down Expand Up @@ -2555,7 +2560,7 @@ jobs:
- name: Build
run: |
./autogen.sh
CFLAGS="-ggdb -Werror" ./configure --enable-unittests --enable-gccprotect --disable-gccmarch-native --disable-shared --with-libpcap-includes=/npcap/Include --with-libpcap-libraries=/npcap/Lib/x64
CFLAGS="-ggdb -Werror" ./configure --enable-unittests --enable-gccprotect --disable-gccmarch-native --disable-shared --disable-lua --with-libpcap-includes=/npcap/Include --with-libpcap-libraries=/npcap/Lib/x64
make -j3
- name: Run
run: |
Expand Down Expand Up @@ -2600,7 +2605,7 @@ jobs:
- name: Build
run: |
./autogen.sh
CFLAGS="-ggdb -Werror" ./configure --enable-unittests --enable-gccprotect --disable-gccmarch-native --disable-shared --with-libpcap-includes=/npcap/Include --with-libpcap-libraries=/npcap/Lib/x64
CFLAGS="-ggdb -Werror" ./configure --enable-unittests --enable-gccprotect --disable-gccmarch-native --disable-shared --disable-lua --with-libpcap-includes=/npcap/Include --with-libpcap-libraries=/npcap/Lib/x64
make -j3
- name: Run
run: |
Expand Down Expand Up @@ -2649,7 +2654,7 @@ jobs:
- name: Build
run: |
./autogen.sh
CFLAGS="-ggdb -Werror" ./configure --enable-gccprotect --disable-gccmarch-native --disable-shared --enable-windivert --with-windivert-include=/windivert/WinDivert-1.4.3-A/include --with-windivert-libraries=/windivert/WinDivert-1.4.3-A/x86_64
CFLAGS="-ggdb -Werror" ./configure --enable-gccprotect --disable-gccmarch-native --disable-shared --disable-lua --enable-windivert --with-windivert-include=/windivert/WinDivert-1.4.3-A/include --with-windivert-libraries=/windivert/WinDivert-1.4.3-A/x86_64
make -j3
- name: Run
run: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ jobs:
sudo apt-get install libssl-dev
sudo apt-get install libpcre2-dev
sudo apt-get install libjansson-dev
sudo apt-get install liblua5.4-dev
sudo apt-get install libpcap-dev
sudo apt-get install libnuma-dev
git clone --depth 1 https://github.com/OISF/libhtp.git
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/commits.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ jobs:
git checkout $rev
echo "Building rev ${rev}" | tee -a build_log.txt
./autogen.sh >> build_log.txt 2>&1
CC="sccache gcc" ./configure --enable-unittests >> build_log.txt 2>&1
CC="sccache gcc" ./configure --enable-unittests --disable-lua >> build_log.txt 2>&1
if ! make -j2 >> build_log.txt 2>&1; then
echo "::error ::Failed to build rev ${rev}"
tail -n 50 build_log.txt
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/formatting.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ jobs:
libyaml-dev \
libcap-ng-dev \
libcap-ng0 \
liblua5.4-dev \
libmagic-dev \
libnetfilter-queue-dev \
libnetfilter-queue1 \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scan-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
libnuma-dev \
libhiredis-dev \
libhyperscan-dev \
liblua5.1-dev \
liblua5.4-dev \
libjansson-dev \
libevent-dev \
libevent-pthreads-2.1-7 \
Expand Down
Loading
Loading