Skip to content

Commit

Permalink
Put zeek source in zeek-src directory
Browse files Browse the repository at this point in the history
  • Loading branch information
philrz committed Dec 29, 2023
1 parent 04ec9e8 commit f56ffd2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
ref: ${{ inputs.zeek_ref }}
fetch-depth: 1
submodules: recursive
path: zeek
path: zeek-src

- name: Build zeekrunner (Windows)
if: startsWith(matrix.platform, 'windows-')
Expand All @@ -70,8 +70,8 @@ jobs:
choco install -y --no-progress winflexbison3
call refreshenv
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x86_amd64
mkdir zeek\build
cd zeek\build
mkdir zeek-src\build
cd zeek-src\build
cmake.exe .. -DCMAKE_BUILD_TYPE=release -DENABLE_ZEEK_UNIT_TESTS=yes -D CMAKE_INSTALL_PREFIX=/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 .
Expand All @@ -93,7 +93,7 @@ jobs:
- name: Build Zeek (Linux/macOS)
if: "!startsWith(matrix.platform, 'windows-')"
run: |
cd zeek
cd zeek-src
./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
make -j${{ steps.cpu-cores.outputs.count }}
sudo make install
Expand Down
1 change: 0 additions & 1 deletion release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ install_zeek_package salesforce/hassh 76a47abe9382109ce9ba530e7f1d7014a4a95209
install_zeek_package salesforce/ja3 421dd4f3616b533e6971bb700289c6bb8355e707
echo "@load policy/protocols/conn/community-id-logging" | $sudo tee -a $zeekpath/share/zeek/site/local.zeek

mv zeek zeek-src
mkdir -p zeek/bin zeek/lib/zeek zeek/share/zeek
cp zeekrunner$exe zeek/
cp $zeekpath/bin/zeek$exe zeek/bin/
Expand Down

0 comments on commit f56ffd2

Please sign in to comment.