From: Jason Ish Date: Fri, 24 Nov 2023 16:39:21 +0000 (-0600) Subject: github-ci: remove Fedora 36, 37; add Fedora 39 X-Git-Tag: suricata-6.0.16~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1384734acc2b69f8f9b7099df6c7b0293663284;p=thirdparty%2Fsuricata.git github-ci: remove Fedora 36, 37; add Fedora 39 Fedora 36 is EOL and some mirrors have been removed. Fedora 37 security updates stop in in December 2023. --- diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index b3eea82c7f..d237025b3a 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -424,11 +424,11 @@ jobs: - run: suricata-update -V - run: suricatasc -h - # Fedora 38 build using Clang. - fedora-38-clang: - name: Fedora 38 (clang, debug, asan, wshadow, rust-strict, systemd) + # Fedora 39 build using Clang. + fedora-39-clang: + name: Fedora 39 (clang, debug, asan, wshadow, rust-strict, systemd) runs-on: ubuntu-latest - container: fedora:38 + container: fedora:39 needs: [prepare-deps] steps: @@ -511,11 +511,11 @@ jobs: - run: suricata-update -V - run: suricatasc -h - # Fedora 38 build using GCC. - fedora-38-gcc: - name: Fedora 38 (gcc, debug, asan, wshadow, rust-strict) + # Fedora 39 build using GCC. + fedora-39-gcc: + name: Fedora 39 (gcc, debug, asan, wshadow, rust-strict) runs-on: ubuntu-latest - container: fedora:38 + container: fedora:39 needs: [prepare-deps] steps: @@ -586,12 +586,12 @@ jobs: - run: suricata-update -V - run: suricatasc -h - # Fedora 37 build using Clang. - fedora-37-clang: - name: Fedora 37 (clang, debug, asan, wshadow, rust-strict, systemd) + # Fedora 38 build using Clang. + fedora-38-clang: + name: Fedora 38 (clang, debug, asan, wshadow, rust-strict, systemd) runs-on: ubuntu-latest - container: fedora:37 - needs: [prepare-deps, prepare-cbindgen] + container: fedora:38 + needs: [prepare-deps] steps: # Cache Rust stuff. @@ -613,6 +613,7 @@ jobs: autoconf \ automake \ cargo \ + cbindgen \ ccache \ clang \ diffutils \ @@ -654,12 +655,6 @@ jobs: path: prep - run: tar xf prep/libhtp.tar.gz - run: tar xf prep/suricata-update.tar.gz - - name: Setup cbindgen - run: | - mkdir -p $HOME/.cargo/bin - cp prep/cbindgen $HOME/.cargo/bin - chmod 755 $HOME/.cargo/bin/cbindgen - echo "$HOME/.cargo/bin" >> $GITHUB_PATH - 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 env: @@ -672,16 +667,18 @@ jobs: run: tar xf prep/suricata-verify.tar.gz - name: Running suricata-verify run: python3 ./suricata-verify/run.py -q --debug-failed + # Now install and make sure headers and libraries aren't + # installed until requested. - run: make install - run: suricata-update -V - run: suricatasc -h - # Fedora 37 build using GCC. - fedora-37-gcc: - name: Fedora 37 (gcc, debug, asan, wshadow, rust-strict) + # Fedora 38 build using GCC. + fedora-38-gcc: + name: Fedora 38 (gcc, debug, asan, wshadow, rust-strict) runs-on: ubuntu-latest - container: fedora:37 - needs: [prepare-deps, prepare-cbindgen] + container: fedora:38 + needs: [prepare-deps] steps: # Cache Rust stuff. @@ -696,6 +693,7 @@ jobs: autoconf \ automake \ cargo \ + cbindgen \ ccache \ diffutils \ file-devel \ @@ -733,12 +731,6 @@ jobs: path: prep - run: tar xf prep/libhtp.tar.gz - run: tar xf prep/suricata-update.tar.gz - - name: Setup cbindgen - run: | - mkdir -p $HOME/.cargo/bin - cp prep/cbindgen $HOME/.cargo/bin - chmod 755 $HOME/.cargo/bin/cbindgen - echo "$HOME/.cargo/bin" >> $GITHUB_PATH - run: ./autogen.sh - run: ./configure --enable-debug --enable-unittests --disable-shared --enable-rust-strict --enable-hiredis --enable-nfqueue env: @@ -756,86 +748,6 @@ jobs: - run: suricata-update -V - run: suricatasc -h - fedora-36: - name: Fedora 36 (debug, clang, asan, wshadow, rust-strict) - runs-on: ubuntu-latest - container: fedora:36 - needs: [prepare-deps, prepare-cbindgen] - steps: - - # Cache Rust stuff. - - name: Cache cargo registry - uses: actions/cache@v1 - with: - path: ~/.cargo/registry - key: cargo-registry - - - run: | - dnf -y install \ - autoconf \ - automake \ - cargo \ - ccache \ - clang \ - diffutils \ - file-devel \ - gcc \ - gcc-c++ \ - git \ - hiredis-devel \ - jansson-devel \ - jq \ - lua-devel \ - libasan \ - libtool \ - libyaml-devel \ - libnfnetlink-devel \ - libnetfilter_queue-devel \ - libnet-devel \ - libcap-ng-devel \ - libevent-devel \ - libmaxminddb-devel \ - libpcap-devel \ - libtool \ - lz4-devel \ - make \ - nspr-devel \ - nss-devel \ - nss-softokn-devel \ - pcre-devel \ - pkgconfig \ - python3-yaml \ - sudo \ - which \ - zlib-devel - - uses: actions/checkout@dcd71f646680f2efd8db4afa5ad64fdcba30e748 - - uses: actions/download-artifact@v2 - with: - name: prep - path: prep - - run: tar xf prep/libhtp.tar.gz - - run: tar xf prep/suricata-update.tar.gz - - name: Setup cbindgen - run: | - mkdir -p $HOME/.cargo/bin - cp prep/cbindgen $HOME/.cargo/bin - chmod 755 $HOME/.cargo/bin/cbindgen - echo "$HOME/.cargo/bin" >> $GITHUB_PATH - - 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 - env: - ac_cv_func_realloc_0_nonnull: "yes" - ac_cv_func_malloc_0_nonnull: "yes" - - run: make -j2 - - run: ASAN_OPTIONS="detect_leaks=0" ./src/suricata -u -l . - - name: Extracting suricata-verify - run: tar xf prep/suricata-verify.tar.gz - - name: Running suricata-verify - run: python3 ./suricata-verify/run.py - - run: make install - - run: suricata-update -V - - run: suricatasc -h - ubuntu-20-04: name: Ubuntu 20.04 (no nss, no nspr) runs-on: ubuntu-latest