diff options
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/build.yml | 32 | ||||
| -rw-r--r-- | .github/workflows/build_scheduled.yml | 6 |
2 files changed, 6 insertions, 32 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 766e7d3af..cfc2efa46 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,9 +76,8 @@ jobs: strategy: fail-fast: true matrix: - # macOS-latest == macos-14 on **ARM64**. Also macos-15 is on arm64 - # There are some issues with external dependencies on macOS-14/15. Disable it for the time being - os: ["ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04", "macOS-13"] + # macos-14 and 15 are on **ARM64** + os: ["ubuntu-20.04", "ubuntu-22.04", "ubuntu-24.04", "macOS-13", "macOS-14", "macOS-15"] gcrypt: ["--with-local-libgcrypt", ""] compiler: ["cc"] pcre: [""] @@ -131,25 +130,11 @@ jobs: nBPF: "" global_context: "--disable-global-context-support" - compiler: "cc" - os: macOS-13 + os: macOS-latest gcrypt: "" pcre: "--with-pcre2" maxminddb: "--with-maxminddb" - msan: "" # Disable sanitizer on macos - nBPF: "" - - compiler: "cc" - os: macos-14 - gcrypt: "" - pcre: "" - maxminddb: "" - msan: "" # Disable sanitizer on macos - nBPF: "" - - compiler: "cc" - os: macos-15 - gcrypt: "" - pcre: "" - maxminddb: "" - msan: "" # Disable sanitizer on macos + msan: "" nBPF: "" steps: - uses: actions/checkout@v4 @@ -215,18 +200,10 @@ jobs: run: | ./autogen.sh --enable-option-checking=fatal --enable-debug-messages ${{ matrix.gcrypt }} ${{ matrix.msan }} ${{ matrix.pcre }} ${{ matrix.maxminddb }} --enable-tls-sigs ${{ matrix.global_context}} - name: Build nDPI - if: ${{ !startsWith(matrix.os, 'macos-14') && !startsWith(matrix.os, 'macos-15') }} run: | make -j all make -C example ndpiSimpleIntegration make -C rrdtool - - name: Build nDPI (MacOS M1) - if: startsWith(matrix.os, 'macos-14') || startsWith(matrix.os, 'macos-15') - run: | - make -j all - make -C example ndpiSimpleIntegration - # There are somes issues with librrd - # make -C rrdtool - name: Print nDPI long help run: | cd ./example && ./ndpiReader -H @@ -244,7 +221,6 @@ jobs: run: | NDPI_FORCE_PARALLEL_UTESTS=1 NDPI_SKIP_PARALLEL_BAR=1 ./tests/do.sh - name: Test nDPI [UNIT] - if: ${{ !startsWith(matrix.os, 'macos-14') && !startsWith(matrix.os, 'macos-15') }} run: | ./tests/do-unit.sh - name: Test nDPI [DGA] diff --git a/.github/workflows/build_scheduled.yml b/.github/workflows/build_scheduled.yml index a295cdfed..52971b3be 100644 --- a/.github/workflows/build_scheduled.yml +++ b/.github/workflows/build_scheduled.yml @@ -73,7 +73,6 @@ jobs: name: Performance (ubuntu-latest) runs-on: ubuntu-latest env: - GO111MODULE: on CFLAGS: -Werror steps: - uses: actions/checkout@v4 @@ -81,11 +80,10 @@ jobs: fetch-depth: 0 - name: Install Ubuntu Prerequisites run: | - sudo add-apt-repository ppa:longsleep/golang-backports sudo apt-get update sudo apt-get install libunwind-dev sudo apt-get install autoconf automake libtool pkg-config gettext flex bison libpcap-dev parallel - sudo apt-get install golang-1.16-go libgoogle-perftools-dev graphviz + sudo apt-get install libgoogle-perftools-dev graphviz go install github.com/google/pprof@latest sudo ln -s ${HOME}/go/bin/pprof /usr/bin/pprof pprof -h @@ -122,7 +120,7 @@ jobs: - name: Install Ubuntu Prerequisites run: | sudo apt-get update - sudo apt-get install autoconf automake libtool pkg-config gettext flex bison libjson-c libpcap-dev rrdtool librrd-dev parallel + sudo apt-get install autoconf automake libtool pkg-config gettext flex bison libjson-c-dev libpcap-dev rrdtool librrd-dev parallel - name: Configure nDPI run: | ./autogen.sh --enable-option-checking=fatal --with-thread-sanitizer |