diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2357545..62907fb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,16 +23,6 @@ jobs: with: go-version-file: go.mod - - name: Get OS and arch detail - run: | - echo "GOOS=$(go env GOOS)" >> $GITHUB_OUTPUT - echo "GOARCH=$(go env GOARCH)" >> $GITHUB_OUTPUT - shell: bash - id: buildinfo - - - name: Print what the artifact name would be - run: echo "Artifact name would be zeek-${{ inputs.tag }}-${{ steps.buildinfo.outputs.GOOS }}-${{ steps.buildinfo.outputs.GOARCH }}" - - name: Checkout zeek uses: actions/checkout@v3 with: @@ -77,7 +67,7 @@ jobs: if: "!startsWith(matrix.platform, 'windows-')" run: | cd zeek - ./configure --binary-package --disable-archiver --disable-auxtools --disable-broker-tests --disable-python --disable-zeekctl --enable-static-binpac --enable-static-broker + ./configure --enable-static-broker make -j${{ steps.cpu-cores.outputs.count }} sudo make install @@ -89,4 +79,4 @@ jobs: uses: actions/upload-artifact@v4 with: path: zeek - name: zeek-${{ inputs.tag }}-${{ steps.buildinfo.outputs.GOOS }}-${{ steps.buildinfo.outputs.GOARCH }} + name: zeek-*.zip diff --git a/release.sh b/release.sh index 6d21587..d8f8cf6 100755 --- a/release.sh +++ b/release.sh @@ -3,14 +3,17 @@ case $(uname) in Darwin) sudo=sudo + zip=zip zeekpath=/usr/local/zeek ;; Linux) sudo=sudo + zip=zip zeekpath=/usr/local/zeek ;; *_NT-*) exe=.exe + zip=/c/msys64/usr/bin/zip zeekpath=/d/usr/local/zeek ;; *) @@ -81,3 +84,5 @@ cp -R $zeekpath/lib/zeek/plugins zeek/lib/zeek/ for d in base policy site builtin-plugins; do cp -R $zeekpath/share/zeek/$d zeek/share/zeek/ done + +$zip -r zeek-taghere.$(go env GOOS)-$(go env GOARCH).zip zeek