diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6605334954..a068ab6286 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,6 +40,7 @@ jobs: buildopt: "--kafka --pfring" fpmdeps: "-d perl-libwww-perl -d perl-JSON -d ethtool -d libyaml -d perl-LWP-Protocol-https" package: rpm + notice: true - version: ubuntu2004 container: andywick/arkime-build-20:5.0.0-2 @@ -105,7 +106,6 @@ jobs: - name: capture tests run: | - echo "ALW ${{ github.run_id }} ${{ github.run_number }} ${{ github.run_attempt }}" (cd tests; ./tests.pl) - name: ui test @@ -201,6 +201,13 @@ jobs: export PATH=/opt/arkime/bin:$PATH (cd tests ; G_SLICE=always-malloc ./tests.pl --viewer) + - name: notice + if: ${{ matrix.notice }} + run: | + export PATH=/opt/arkime/bin:$PATH + (npm install license-checker; release/notice.txt.pl /opt/arkime NOTICE release/CAPTURENOTICE > NOTICE.txt) + ls -l NOT* + - name: upload github if: github.event_name == 'push' && github.ref == 'refs/heads/main' uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1 @@ -214,6 +221,7 @@ jobs: *.so *.rpm *.zst + NOTICE.txt slack: runs-on: ubuntu-latest diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e5365938ac..f1f5fba247 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -42,6 +42,7 @@ jobs: buildopt: "--kafka --pfring" fpmdeps: "-d perl-libwww-perl -d perl-JSON -d ethtool -d libyaml -d perl-LWP-Protocol-https" package: rpm + notice: true - version: ubuntu2004 container: andywick/arkime-build-20:5.0.0-2 @@ -160,6 +161,12 @@ jobs: fpm -s dir -t deb -n moloch -x data/moloch/logs -x data/moloch/raw -v $ARKIME_VERSION --iteration ${{ github.event.inputs.iteration }} --template-scripts --after-install "release/afterinstall.sh" --url "https://arkime.com" --description "Moloch Full Packet System" ${{ matrix.fpmdeps }} -p moloch_${ARKIME_VERSION}-${{github.event.inputs.iteration}}.${{matrix.version}}_amd64.deb /data/moloch ls -l *.deb + - name: notice + if: ${{ matrix.notice }} + run: | + export PATH=/opt/arkime/bin:$PATH + (npm install license-checker; release/notice.txt.pl /opt/arkime NOTICE release/CAPTURENOTICE > NOTICE.txt) + - name: upload github uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # v1 with: @@ -172,8 +179,11 @@ jobs: *.so *.rpm *.zst + NOTICE.txt body: | - ### [Installation Instructions](https://raw.githubusercontent.com/arkime/arkime/main/release/README.txt) | [5.x Upgrade instructions](https://arkime.com/faq#how_do_i_upgrade_to_arkime_5) | [Copyright Notices](https://s3.amazonaws.com/files.molo.ch/NOTICE.txt) | [FAQ](https://arkime.com/faq) | [CHANGELOG](https://raw.githubusercontent.com/arkime/arkime/main/CHANGELOG) + ### [Installation Instructions](https://raw.githubusercontent.com/arkime/arkime/main/release/README.txt) | [5.x Upgrade instructions](https://arkime.com/faq#how_do_i_upgrade_to_arkime_5) | [FAQ](https://arkime.com/faq) | [CHANGELOG](https://raw.githubusercontent.com/arkime/arkime/main/CHANGELOG) | [JA4+ Install](https://arkime.com/ja4) + + A db.pl upgrade is required when upgrading from 4.x ### Download Info We offer downloads for many different OS versions because of library differences. For example, use the el7 download for Centos 7 or RHEL 7. If you have a libssl version error, it is most likely that the wrong download was used for your OS. The moloch builds have the old filesystem layouts, we will stop providing the moloch builds in 2024 diff --git a/CHANGELOG b/CHANGELOG index 9dcfb4001a..178b00c7de 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -46,6 +46,7 @@ NOTICE: Create a parliament config file before upgrading (see https://arkime.com https://arkime.com/settings#user-setting-defaults - #2681 fix unique of numerical fields - #2701 Make sure pcap reassembly doesn't starve viewer + - #2704 Support viewUrl having a path 5.0.1 2024/02/20 ## Release diff --git a/release/getiteration.sh b/release/getiteration.sh deleted file mode 100755 index e7e728be27..0000000000 --- a/release/getiteration.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -FILE=$1 - -rm -f $FILE -aws s3 cp --quiet $S3BASE/$FILE $FILE - -if [ -f $FILE ] ; then - NUM=`cat $FILE` -else - NUM=0 -fi - -echo $((++NUM)) -exit 0 diff --git a/release/incriteration.sh b/release/incriteration.sh deleted file mode 100755 index 2d1fad5664..0000000000 --- a/release/incriteration.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -FILE=$1 -rm -f $FILE -aws s3 cp --quiet $S3BASE/$FILE $FILE - -if [ -f $FILE ] ; then - NUM=`cat $FILE` -else - NUM=0 -fi - -echo $((++NUM)) > $FILE -aws s3 cp --quiet $FILE $S3BASE/$FILE diff --git a/release/notice.txt.pl b/release/notice.txt.pl index a944e52f47..cbe0c11570 100755 --- a/release/notice.txt.pl +++ b/release/notice.txt.pl @@ -16,7 +16,7 @@ sub handle { my %DONE; my $topJson = from_json(`npx license-checker --production --json`); -my $viewerJson = from_json(`cd $ARGV[0]/viewer; npx license-checker --production --json`); +#my $viewerJson = from_json(`cd $ARGV[0]/viewer; npx license-checker --production --json`); my $cont3xtJson = from_json(`cd $ARGV[0]/cont3xt; npx license-checker --production --json`); shift @ARGV; @@ -30,10 +30,10 @@ sub handle { handle($key, $topJson->{$key}); } -for my $key (keys %$viewerJson) { - $DONE{$key} = 1; - handle($key, $viewerJson->{$key}); -} +#for my $key (keys %$viewerJson) { +# $DONE{$key} = 1; +# handle($key, $viewerJson->{$key}); +#} for my $key (keys %$cont3xtJson) { next if ($DONE{$key} == 1);