diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f12df32..9aeb30c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,109 +20,9 @@ jobs: runs-on: ${{ matrix.platform }} steps: - - name: Checkout build-zeek - uses: actions/checkout@v3 - - - name: Setup Go - uses: actions/setup-go@v3 - with: - go-version: 1.21 - - - name: Checkout zeek - uses: actions/checkout@v3 - with: - repository: zeek/zeek - ref: v6.0.2 - fetch-depth: 1 - submodules: recursive - path: zeek-src - - - name: Build zeekrunner (Windows) - if: startsWith(matrix.platform, 'windows-') - run: go build -o zeekrunner.exe zeekrunner.go - - - name: Build libmaxminddb (Windows) - if: startsWith(matrix.platform, 'windows-') - run: | - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 - curl -L https://github.com/maxmind/libmaxminddb/releases/download/1.9.0/libmaxminddb-1.9.0.tar.gz | tar xzvf - - mkdir libmaxminddb-1.9.0\build - cd libmaxminddb-1.9.0\build - cmake .. - cmake --build . - cmake --build . --target install - shell: cmd - - - uses: actions/cache@v3 - with: - path: ${{runner.temp}}/.ccache - key: ${{ runner.os }}-ccache - - - name: Build Zeek (Windows) - if: startsWith(matrix.platform, 'windows-') - run: | - choco install -y --no-progress conan --version=1.58.0 - choco install -y --no-progress winflexbison3 - choco install -y --no-progress ccache - call refreshenv - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 - mkdir zeek-src\build - cd zeek-src\build - cmake.exe .. -DCMAKE_BUILD_TYPE=release -DENABLE_ZEEK_UNIT_TESTS=yes -D CMAKE_INSTALL_PREFIX="C:\Program Files\Git\usr\local\zeek" -DLibMMDB_INCLUDE_DIR="C:\Program Files (x86)\maxminddb\include" -DLibMMDB_LIBRARY="C:\Program Files (x86)\maxminddb\lib\maxminddb.lib" -G Ninja - cmake.exe --build . - cmake.exe --install . - cd - shell: cmd - env: - CCACHE_DIR: ${{runner.temp}}/.ccache - CMAKE_CXX_COMPILER_LAUNCHER: ccache - CMAKE_C_COMPILER_LAUNCHER: ccache - - - name: Install dependencies (Linux) - if: startsWith(matrix.platform, 'ubuntu-') - run: | - sudo apt-get -y install ccache cmake make gcc g++ flex libfl-dev bison libpcap-dev libssl-dev python3 python3-dev python3-setuptools swig zlib1g-dev zip libmaxminddb-dev - # Removing shared objects to force static linking. - sudo find /usr/lib \( -name libpcap.so\* -o -name libmaxminddb.so\* \) -delete - - - name: Install dependencies (macOS) - if: startsWith(matrix.platform, 'macos-') - run: brew install ccache cmake swig openssl bison flex libmaxminddb - - - name: Get number of CPU cores - uses: SimenB/github-actions-cpu-cores@v1 - id: cpu-cores - - - name: Build Zeek (Linux/macOS) - if: "!startsWith(matrix.platform, 'windows-')" - run: | - cd zeek-src - [ $(uname) = Linux ] && linux_flags='-D ZLIB_USE_STATIC_LIBS=TRUE' - ./configure --binary-package --enable-static-broker --enable-static-binpac --disable-spicy --disable-af-packet --disable-zeekctl --disable-python --disable-broker-tests --disable-auxtools --disable-archiver --osx-min-version=12 -D OPENSSL_USE_STATIC_LIBS=TRUE $linux_flags - make -j${{ steps.cpu-cores.outputs.count }} - sudo make install - sudo strip /usr/local/zeek/bin/zeek - env: - CCACHE_DIR: ${{runner.temp}}/.ccache - CMAKE_CXX_COMPILER_LAUNCHER: ccache - CMAKE_C_COMPILER_LAUNCHER: ccache - - - name: Finish packaging artifact - run: ./release.sh + - run: | + set -x +e + which sed + sed -v + sed --version shell: sh - - - name: Upload artifact - uses: actions/upload-artifact@v4 - with: - name: ${{ matrix.platform }} - path: zeek-*.zip - - - name: Publish artifact as release - if: startsWith(github.event.ref, 'refs/tags/') - uses: svenstaro/upload-release-action@2.7.0 - with: - repo_token: ${{ secrets.GITHUB_TOKEN }} - file: zeek-*.zip - file_glob: true - tag: ${{ github.ref }} - overwrite: true