From d1575175f6c0fe4b24cc09f9f2c14bb37a246d55 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 12:30:26 -0400 Subject: [PATCH 01/84] Create main.yml --- .github/workflows/main.yml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..2e26786 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,24 @@ +name: CICD +on: + push: + branches: [main] + workflow_dispatch: + +jobs: + wireshark-linux: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4 + - name: build + run: cd wireshark/build-scripts && sudo ./linux_build.sh 4.4.0 + + wireshark-macos: + runs-on: macOS-latest + steps: + - name: checkout + uses: actions/checkout@v4 + - name: build + run: cd wireshark/build-scripts && sudo ./macos_build.sh 4.4.0 + + From 0afdedf0b4e1f4803096e0bf3aa80e72ee5d3282 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 12:38:24 -0400 Subject: [PATCH 02/84] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2e26786..a75f4c2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: - name: checkout uses: actions/checkout@v4 - name: build - run: cd wireshark/build-scripts && sudo ./linux_build.sh 4.4.0 + run: cd wireshark/build-scripts && sudo apt update -y && sudo apt install ninja-build -y && sudo ./linux_build.sh 4.4.0 wireshark-macos: runs-on: macOS-latest From ace15c545c303ab5e5417e7ef012f2b167f61eb3 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 12:41:22 -0400 Subject: [PATCH 03/84] Update macos_build.sh --- wireshark/build-scripts/macos_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark/build-scripts/macos_build.sh b/wireshark/build-scripts/macos_build.sh index 25a935d..205d972 100755 --- a/wireshark/build-scripts/macos_build.sh +++ b/wireshark/build-scripts/macos_build.sh @@ -33,7 +33,7 @@ if [ ! -d build ]; then mkdir build fi -cd build && cmake -DCUSTOM_PLUGIN_SRC_DIR=plugins/epan/ja4 ../ +cd build && cmake -DCUSTOM_PLUGIN_SRC_DIR=plugins/epan/ja4 -DBUILD_wireshark=off ../ echo 'building using make...' make -j8 From 66063714f62a53df9595259f04b5aec2400505b8 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 16:49:41 -0400 Subject: [PATCH 04/84] Update main.yml --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a75f4c2..ef451c1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,9 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 + - name: create non-root user + run: sudo adduser build && usermod -aG sudo - name: build - run: cd wireshark/build-scripts && sudo ./macos_build.sh 4.4.0 + run: cd wireshark/build-scripts && su build && ./macos_build.sh 4.4.0 From db4a903eb64c64cc5e10ee5564aac4dda0ef7e96 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 16:52:26 -0400 Subject: [PATCH 05/84] Update main.yml --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ef451c1..4093d2e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,9 +18,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: create non-root user - run: sudo adduser build && usermod -aG sudo - name: build - run: cd wireshark/build-scripts && su build && ./macos_build.sh 4.4.0 + run: cd wireshark/build-scripts && ./macos_build.sh 4.4.0 From babe2574e58853b9d234861489e5e5b61a7dd30f Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 17:33:43 -0400 Subject: [PATCH 06/84] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4093d2e..de0c3c9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,6 +2,7 @@ name: CICD on: push: branches: [main] + paths: [wireshark/*] workflow_dispatch: jobs: From 7ffb2614dbce950d0bfc223877f86fa9daed8214 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 18:14:50 -0400 Subject: [PATCH 07/84] Update main.yml --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index de0c3c9..20bbf80 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,6 +11,8 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 + - name: test1 + run: cat s - name: build run: cd wireshark/build-scripts && sudo apt update -y && sudo apt install ninja-build -y && sudo ./linux_build.sh 4.4.0 From 3019ee1bbe7e02d3ca3c7741b586c017732271d5 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 18:23:22 -0400 Subject: [PATCH 08/84] Update main.yml --- .github/workflows/main.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 20bbf80..f8a1755 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,10 +11,14 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: test1 - run: cat s - name: build - run: cd wireshark/build-scripts && sudo apt update -y && sudo apt install ninja-build -y && sudo ./linux_build.sh 4.4.0 + #run: cd wireshark/build-scripts && sudo apt update -y && sudo apt install ninja-build -y && sudo ./linux_build.sh 4.4.0 + - name: release + env: + GH_TOKEN: ${{ github.token }} + GH_REPO: ${{ github.repository }} + run: gh release upload ./build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so + wireshark-macos: runs-on: macOS-latest From e072dc75a3d079cc5379fbcf98278075460411e6 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 18:24:51 -0400 Subject: [PATCH 09/84] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f8a1755..fa27526 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,7 +11,7 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - - name: build + #- name: build #run: cd wireshark/build-scripts && sudo apt update -y && sudo apt install ninja-build -y && sudo ./linux_build.sh 4.4.0 - name: release env: From 3c4af57ba5b35077fe5823356d2c322f42fdea8c Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 18:29:43 -0400 Subject: [PATCH 10/84] Update main.yml --- .github/workflows/main.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fa27526..bc5d2c5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -13,11 +13,13 @@ jobs: uses: actions/checkout@v4 #- name: build #run: cd wireshark/build-scripts && sudo apt update -y && sudo apt install ninja-build -y && sudo ./linux_build.sh 4.4.0 + - name: set env + run: echo "NOW=$(date +'%Y.%m.%d')" >> $GITHUB_ENV - name: release env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release upload ./build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so + run: gh release upload ${{ env.NOW }} ./build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so wireshark-macos: From 871a2b9e050d5c838f93053bc94c1197f0c92146 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 18:31:29 -0400 Subject: [PATCH 11/84] Update main.yml --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bc5d2c5..2ba62d6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,8 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release upload ${{ env.NOW }} ./build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so + run: gh release upload ${{ env.NOW }} README.md + #./build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so wireshark-macos: From 6677dfcc42b246ed8ef8f5477e6f7e46b0962d76 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 18:32:58 -0400 Subject: [PATCH 12/84] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2ba62d6..fdffe9e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release upload ${{ env.NOW }} README.md + run: gh release create ${{ env.NOW }} README.md #./build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so From 86c8ae05f3c19bbdba3028250a25ebc81dc321e7 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 18:49:17 -0400 Subject: [PATCH 13/84] Update main.yml --- .github/workflows/main.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fdffe9e..3bfab0e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,24 +11,29 @@ jobs: steps: - name: checkout uses: actions/checkout@v4 - #- name: build - #run: cd wireshark/build-scripts && sudo apt update -y && sudo apt install ninja-build -y && sudo ./linux_build.sh 4.4.0 + - name: build + run: cd wireshark/build-scripts && sudo apt update -y && sudo apt install ninja-build -y && sudo ./linux_build.sh 4.4.0 - name: set env run: echo "NOW=$(date +'%Y.%m.%d')" >> $GITHUB_ENV - name: release env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release create ${{ env.NOW }} README.md - #./build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so + run: gh release create ${{ env.NOW }} ./build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Linux wireshark-macos: runs-on: macOS-latest + needs: [ wireshark-linux ] steps: - name: checkout uses: actions/checkout@v4 - name: build run: cd wireshark/build-scripts && ./macos_build.sh 4.4.0 + - name: release + env: + GH_TOKEN: ${{ github.token }} + GH_REPO: ${{ github.repository }} + run: gh release upload ${{ env.NOW }} ./build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Mac From 601d0af56db0c3d507ba633de1a0547389d97f3c Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 20:00:03 -0400 Subject: [PATCH 14/84] Update main.yml --- .github/workflows/main.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3bfab0e..dffde68 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,12 +19,11 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release create ${{ env.NOW }} ./build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Linux + run: gh release create ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Linux wireshark-macos: runs-on: macOS-latest - needs: [ wireshark-linux ] steps: - name: checkout uses: actions/checkout@v4 @@ -34,6 +33,6 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release upload ${{ env.NOW }} ./build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Mac + run: gh release upload ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Mac From 59a2cf91f9263dbb364265b6a1d447cc53f0cab6 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 20:10:52 -0400 Subject: [PATCH 15/84] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dffde68..f795b9a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,7 +19,7 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release create ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Linux + run: gh release create ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Linux-plugin wireshark-macos: @@ -33,6 +33,6 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release upload ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Mac + run: gh release create ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Mac-plugin From f57d7acbbd12883b90d402efb5d2e2e864e2b6ba Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 20:23:31 -0400 Subject: [PATCH 16/84] Update main.yml --- .github/workflows/main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f795b9a..08c70c8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,12 +9,12 @@ jobs: wireshark-linux: runs-on: ubuntu-latest steps: + - name: set env + run: echo "NOW=$(date +'%Y.%m.%d.%M')" >> $GITHUB_ENV - name: checkout uses: actions/checkout@v4 - name: build run: cd wireshark/build-scripts && sudo apt update -y && sudo apt install ninja-build -y && sudo ./linux_build.sh 4.4.0 - - name: set env - run: echo "NOW=$(date +'%Y.%m.%d')" >> $GITHUB_ENV - name: release env: GH_TOKEN: ${{ github.token }} @@ -25,6 +25,8 @@ jobs: wireshark-macos: runs-on: macOS-latest steps: + - name: set env + run: echo "NOW=$(date +'%Y.%m.%d.%M')" >> $GITHUB_ENV - name: checkout uses: actions/checkout@v4 - name: build @@ -33,6 +35,6 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release create ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Mac-plugin + run: gh release upload ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Mac-plugin From 610ada4c946ef3c2f78933d0350ceb7f5b99cd14 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 20:39:54 -0400 Subject: [PATCH 17/84] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 08c70c8..343d9c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,6 +35,6 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release upload ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Mac-plugin + run: gh release upload ${{ env.NOW }} ./ja4-plugin/run/Wireshark.app/Contents/PlugIns/wireshark/4-4/epan/#Mac-plugin From 700f16ecfda8caf2406ef58278fa0d69ff4ee698 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 20:40:51 -0400 Subject: [PATCH 18/84] Update macos_build.sh --- wireshark/build-scripts/macos_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark/build-scripts/macos_build.sh b/wireshark/build-scripts/macos_build.sh index 205d972..0cf5d87 100755 --- a/wireshark/build-scripts/macos_build.sh +++ b/wireshark/build-scripts/macos_build.sh @@ -42,5 +42,5 @@ if [ ! -d ../../../../ja4-plugin ]; then fi cp `find . -name ja4.so` ../../../../ja4-plugin/ -echo "Your JA4 Plugin is ready at `pwd`/../../../../ja4-plugin/ja4.so" +echo "Your JA4 Plugin is ready at `find . -name ja4.so` From 061ab327b7e5336effe318b0d2a5b2341fdf28ba Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 20:43:08 -0400 Subject: [PATCH 19/84] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 343d9c0..15fcb66 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,7 +2,7 @@ name: CICD on: push: branches: [main] - paths: [wireshark/*] + paths: [wireshark/*, wireshark/source/*, wireshark/build-scripts/*] workflow_dispatch: jobs: From d263816867bc3f9616899fc5ac244cf9dd90ba24 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 20:44:24 -0400 Subject: [PATCH 20/84] Update macos_build.sh --- wireshark/build-scripts/macos_build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/wireshark/build-scripts/macos_build.sh b/wireshark/build-scripts/macos_build.sh index 0cf5d87..4d525c4 100755 --- a/wireshark/build-scripts/macos_build.sh +++ b/wireshark/build-scripts/macos_build.sh @@ -44,3 +44,4 @@ fi cp `find . -name ja4.so` ../../../../ja4-plugin/ echo "Your JA4 Plugin is ready at `find . -name ja4.so` + From 2c9418f0f8e1c54a93cb89d9931c0a3232e5bb98 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 20:49:25 -0400 Subject: [PATCH 21/84] Update macos_build.sh --- wireshark/build-scripts/macos_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark/build-scripts/macos_build.sh b/wireshark/build-scripts/macos_build.sh index 4d525c4..1824677 100755 --- a/wireshark/build-scripts/macos_build.sh +++ b/wireshark/build-scripts/macos_build.sh @@ -42,6 +42,6 @@ if [ ! -d ../../../../ja4-plugin ]; then fi cp `find . -name ja4.so` ../../../../ja4-plugin/ -echo "Your JA4 Plugin is ready at `find . -name ja4.so` +echo "Your JA4 Plugin is ready at" `find . -name ja4.so` From cbe97797960080e3319022e5f29f0907acdbd34d Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 20:56:52 -0400 Subject: [PATCH 22/84] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 15fcb66..9a1f53c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,6 +35,6 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release upload ${{ env.NOW }} ./ja4-plugin/run/Wireshark.app/Contents/PlugIns/wireshark/4-4/epan/#Mac-plugin + run: gh release upload ${{ env.NOW }} ./run/Wireshark.app/Contents/PlugIns/wireshark/4-4/epan/ja4.so#Mac-plugin From c58229b00b73d55b39a4d4a04dcc245d34ab00cf Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 20:57:49 -0400 Subject: [PATCH 23/84] Update macos_build.sh --- wireshark/build-scripts/macos_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wireshark/build-scripts/macos_build.sh b/wireshark/build-scripts/macos_build.sh index 1824677..972f0b3 100755 --- a/wireshark/build-scripts/macos_build.sh +++ b/wireshark/build-scripts/macos_build.sh @@ -26,7 +26,7 @@ if [ ! -d wireshark-$VER ] cd wireshark-$VER fi - +rm -rf ./plugins/epan/ja4 cp -r ../../source ./plugins/epan/ja4 if [ ! -d build ]; then From 6335c42f7febd2edf439a3cc8b598f472a1ed199 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Tue, 17 Sep 2024 21:03:24 -0400 Subject: [PATCH 24/84] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9a1f53c..093ccf8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,6 +35,6 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release upload ${{ env.NOW }} ./run/Wireshark.app/Contents/PlugIns/wireshark/4-4/epan/ja4.so#Mac-plugin + run: gh release upload ${{ env.NOW }} ./wireshark/build-scripts/run/Wireshark.app/Contents/PlugIns/wireshark/4-4/epan/ja4.so#Mac-plugin From 670ec0650acdd62d2d69b9bf744e814dde26da6d Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 09:14:19 -0400 Subject: [PATCH 25/84] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 093ccf8..33833cc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,6 +35,6 @@ jobs: env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release upload ${{ env.NOW }} ./wireshark/build-scripts/run/Wireshark.app/Contents/PlugIns/wireshark/4-4/epan/ja4.so#Mac-plugin + run: gh release upload ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/Wireshark.app/Contents/PlugIns/wireshark/4-4/epan/ja4.so#Mac-plugin From 370411d722770c8262c269e89491269276689347 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 10:17:49 -0400 Subject: [PATCH 26/84] added windows build --- .github/workflows/windows.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/windows.yml diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml new file mode 100644 index 0000000..9660f97 --- /dev/null +++ b/.github/workflows/windows.yml @@ -0,0 +1,26 @@ +name: windows-build +on: + push: + branches: [main] + paths: [wireshark/*, wireshark/source/*, wireshark/build-scripts/*] + workflow_dispatch: + +jobs: + wireshark-windows: + name: build + runs-on: windows-2022 + env: + PLATFORM: x64 + WIRESHARK_BASE_DIR: C:\Development + CMAKE_PREFIX_PATH: D:\a\wireshark\Qt\6.2.3\msvc2019_64 + WIRESHARK_VERSION_EXTRA: -GithubActionBuild + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Choco install + run: choco install -y --force --no-progress asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake + - name: Install strawberryperl + uses: shogo82148/actions-setup-perl@v1 + with: + perl-version: '5.30' + distribution: strawberry From b26e2c149dff1ac9f35ec6a56220d89f870fbcca Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 10:40:40 -0400 Subject: [PATCH 27/84] updates --- .github/workflows/windows.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9660f97..6af25ff 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,10 +17,12 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Choco install - run: choco install -y --force --no-progress asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake - - name: Install strawberryperl - uses: shogo82148/actions-setup-perl@v1 + - name: cache + uses: actions/cache@v3 with: - perl-version: '5.30' - distribution: strawberry + path: /tmp + key: C:/Downloads + - name: Set Chocolatey cache location + run: choco config set --name="'cacheLocation'" --value="'C:/Downloads'" + - name: Choco install + run: choco install -y asciidoctorj From 7628e9ff6ac47ba4f8c308191c4f62b5024864b9 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 10:45:39 -0400 Subject: [PATCH 28/84] choco test --- .github/workflows/windows.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6af25ff..d9a23b7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,12 +17,14 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: create cache dir + run: mkdir "C:\choco-cache" - name: cache uses: actions/cache@v3 with: - path: /tmp - key: C:/Downloads + path: "C:\choco-cache" + key: "C:\choco-cache" - name: Set Chocolatey cache location - run: choco config set --name="'cacheLocation'" --value="'C:/Downloads'" + run: choco config set cacheLocation "C:\choco-cache" - name: Choco install - run: choco install -y asciidoctorj + run: choco install -y --force asciidoctorj From 4e0e3d169915d36d7905c86b069b8823e7b08465 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 10:47:37 -0400 Subject: [PATCH 29/84] choco test --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d9a23b7..9a80ef9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -20,7 +20,7 @@ jobs: - name: create cache dir run: mkdir "C:\choco-cache" - name: cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: "C:\choco-cache" key: "C:\choco-cache" From 877ae7c1c279ea1fc8b3ebd9a423498d29387775 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 10:49:18 -0400 Subject: [PATCH 30/84] choco test --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9a80ef9..6d04c5d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -22,8 +22,8 @@ jobs: - name: cache uses: actions/cache@v4 with: - path: "C:\choco-cache" - key: "C:\choco-cache" + path: C:\choco-cache + key: C:\choco-cache - name: Set Chocolatey cache location run: choco config set cacheLocation "C:\choco-cache" - name: Choco install From f1a997638ab579cb0efcdb532c48ff36c5617a5a Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 10:53:15 -0400 Subject: [PATCH 31/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6d04c5d..d08ee73 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -27,4 +27,4 @@ jobs: - name: Set Chocolatey cache location run: choco config set cacheLocation "C:\choco-cache" - name: Choco install - run: choco install -y --force asciidoctorj + run: choco install -y --force asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake From 177d5e7b01ec3ad35f69f24b3bbc10861e46c2eb Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 11:02:36 -0400 Subject: [PATCH 32/84] updates --- .github/workflows/windows.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index d08ee73..0201c8c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,3 +28,25 @@ jobs: run: choco config set cacheLocation "C:\choco-cache" - name: Choco install run: choco install -y --force asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake + - name: Install strawberryperl + uses: shogo82148/actions-setup-perl@v1 + with: + perl-version: '5.30' + distribution: strawberry + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v2 + with: + vs-version: 16.8 + - name: Mkdir + run: mkdir build + - name: Cmake + run: cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. + env: + PLATFORM: x64 + WIRESHARK_BASE_DIR: C:/wireshark-libs + QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 + working-directory: build + - name: Build + run: cmake --build . --config RelWithDebInfo + working-directory: build + From 4ed25850b21cd4a8e83e12d57ee8c6e1146e79f8 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 11:05:36 -0400 Subject: [PATCH 33/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0201c8c..e7b7902 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -27,7 +27,7 @@ jobs: - name: Set Chocolatey cache location run: choco config set cacheLocation "C:\choco-cache" - name: Choco install - run: choco install -y --force asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake + run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake - name: Install strawberryperl uses: shogo82148/actions-setup-perl@v1 with: From 8af53474c6f028b1b375253c73db75cf53c7264c Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 11:26:18 -0400 Subject: [PATCH 34/84] updates --- .github/workflows/windows.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e7b7902..cc12c3b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,6 +26,8 @@ jobs: key: C:\choco-cache - name: Set Chocolatey cache location run: choco config set cacheLocation "C:\choco-cache" + - name: checkout wireshark sources + run: choco install -y git --force --install-arguments="'/DIR=C:\choco-cache\git'" && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - name: Choco install run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake - name: Install strawberryperl From 1b6973b5e561e0356030839a5ae23343f0b80574 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 11:29:56 -0400 Subject: [PATCH 35/84] updates --- .github/workflows/windows.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cc12c3b..cbcd397 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -26,8 +26,10 @@ jobs: key: C:\choco-cache - name: Set Chocolatey cache location run: choco config set cacheLocation "C:\choco-cache" - - name: checkout wireshark sources - run: choco install -y git --force --install-arguments="'/DIR=C:\choco-cache\git'" && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 + - name: install git + run: choco install -y git --force --install-arguments="'/DIR=C:\choco-cache\git'" + - name: checkout wireshark + run: cd wireshark/build-scripts/ && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - name: Choco install run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake - name: Install strawberryperl From ff2b461247b7fceaa75ea6ac84d33e1c1d67b2a2 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 11:42:46 -0400 Subject: [PATCH 36/84] updates --- .github/workflows/windows.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cbcd397..e98f668 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,17 +17,16 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: create cache dir - run: mkdir "C:\choco-cache" + - name: Set Chocolatey cache location + run: choco config set cacheLocation "C:\choco-cache" - name: cache uses: actions/cache@v4 with: - path: C:\choco-cache - key: C:\choco-cache - - name: Set Chocolatey cache location - run: choco config set cacheLocation "C:\choco-cache" - - name: install git - run: choco install -y git --force --install-arguments="'/DIR=C:\choco-cache\git'" + path: C:\choco + key: C:\choco + - name: install xsltproc + run: choco install -y git --force --install-arguments="'/DIR=C:\choco\xsltproc'" + - name: checkout wireshark run: cd wireshark/build-scripts/ && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - name: Choco install From 3dc87b2c3660b324713b83539c3917c033ef2986 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 11:48:10 -0400 Subject: [PATCH 37/84] updates --- .github/workflows/windows.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e98f668..2460860 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,15 +17,21 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + + - name: Create cache directory + rum: mkdir "C:\choco" + - name: Set Chocolatey cache location - run: choco config set cacheLocation "C:\choco-cache" + run: choco config set cacheLocation "C:\choco" + - name: cache uses: actions/cache@v4 with: path: C:\choco key: C:\choco + - name: install xsltproc - run: choco install -y git --force --install-arguments="'/DIR=C:\choco\xsltproc'" + run: choco install -y xsltproc --force --install-arguments="'/DIR=C:\choco\xsltproc'" - name: checkout wireshark run: cd wireshark/build-scripts/ && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 From a2115439a651786c4c136fbfada5e75211d9c076 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 11:49:34 -0400 Subject: [PATCH 38/84] updates --- .github/workflows/windows.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 2460860..cbebb88 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -17,19 +17,15 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 - - name: Create cache directory rum: mkdir "C:\choco" - - - name: Set Chocolatey cache location - run: choco config set cacheLocation "C:\choco" - - name: cache uses: actions/cache@v4 with: path: C:\choco key: C:\choco - + - name: Set Chocolatey cache location + run: choco config set cacheLocation "C:\choco" - name: install xsltproc run: choco install -y xsltproc --force --install-arguments="'/DIR=C:\choco\xsltproc'" From 1c5f1e42d6fc4bcf11d82e8e0ad274dde27aaf6d Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 11:49:59 -0400 Subject: [PATCH 39/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index cbebb88..5a1cc02 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -18,7 +18,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Create cache directory - rum: mkdir "C:\choco" + run: mkdir "C:\choco" - name: cache uses: actions/cache@v4 with: From dd5ffe2c1965b9b15f08b1953e497ad9b51f1367 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 11:55:28 -0400 Subject: [PATCH 40/84] updates --- .github/workflows/windows.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5a1cc02..7bab3bc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -24,11 +24,15 @@ jobs: with: path: C:\choco key: C:\choco + - name: cache + uses: actions/cache@v4 + with: + path: C:\ProgramData\chocolatey\lib\xsltproc + key: C:\ProgramData\chocolatey\lib\xsltproc - name: Set Chocolatey cache location run: choco config set cacheLocation "C:\choco" - name: install xsltproc run: choco install -y xsltproc --force --install-arguments="'/DIR=C:\choco\xsltproc'" - - name: checkout wireshark run: cd wireshark/build-scripts/ && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - name: Choco install From d72e9705331c867b5f647bc601bb22d2372687b6 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:00:40 -0400 Subject: [PATCH 41/84] updates --- .github/workflows/windows.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7bab3bc..f038cd3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -19,16 +19,19 @@ jobs: uses: actions/checkout@v4 - name: Create cache directory run: mkdir "C:\choco" + - name: cache uses: actions/cache@v4 with: path: C:\choco key: C:\choco + - name: cache uses: actions/cache@v4 with: - path: C:\ProgramData\chocolatey\lib\xsltproc - key: C:\ProgramData\chocolatey\lib\xsltproc + path: C:\ProgramData\chocolatey\lib + key: C:\ProgramData\chocolatey\lib + - name: Set Chocolatey cache location run: choco config set cacheLocation "C:\choco" - name: install xsltproc From 54777742a97f140db6781649a5495bfbdcbde11e Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:05:14 -0400 Subject: [PATCH 42/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index f038cd3..58ccaf7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -27,7 +27,7 @@ jobs: key: C:\choco - name: cache - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: C:\ProgramData\chocolatey\lib key: C:\ProgramData\chocolatey\lib From 16e5a6f39a6fb6d7f69274e0b15f99e01b27fc4b Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:08:55 -0400 Subject: [PATCH 43/84] updates --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 58ccaf7..7da5aa0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -21,7 +21,7 @@ jobs: run: mkdir "C:\choco" - name: cache - uses: actions/cache@v4 + uses: actions/cache@v3 with: path: C:\choco key: C:\choco @@ -35,7 +35,7 @@ jobs: - name: Set Chocolatey cache location run: choco config set cacheLocation "C:\choco" - name: install xsltproc - run: choco install -y xsltproc --force --install-arguments="'/DIR=C:\choco\xsltproc'" + run: choco install -y xltproc --install-arguments="'/DIR=C:\choco\xsltproc'" - name: checkout wireshark run: cd wireshark/build-scripts/ && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - name: Choco install From b3f23e7937f741633825a33a832eb524533ea0c1 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:10:17 -0400 Subject: [PATCH 44/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7da5aa0..82d8d9f 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -35,7 +35,7 @@ jobs: - name: Set Chocolatey cache location run: choco config set cacheLocation "C:\choco" - name: install xsltproc - run: choco install -y xltproc --install-arguments="'/DIR=C:\choco\xsltproc'" + run: choco install -y xsltproc --install-arguments="'/DIR=C:\choco\xsltproc'" - name: checkout wireshark run: cd wireshark/build-scripts/ && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - name: Choco install From efe1cc00fbee0865eec09b207c5af93bf07998cd Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:15:43 -0400 Subject: [PATCH 45/84] updates --- .github/workflows/windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 82d8d9f..5d387d5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -34,8 +34,10 @@ jobs: - name: Set Chocolatey cache location run: choco config set cacheLocation "C:\choco" + - name: install xsltproc - run: choco install -y xsltproc --install-arguments="'/DIR=C:\choco\xsltproc'" + run: choco install -y xsltproc + - name: checkout wireshark run: cd wireshark/build-scripts/ && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - name: Choco install From 3e6d92dd886084a50c051ed0a5b0cfc20c6cf45f Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:19:08 -0400 Subject: [PATCH 46/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5d387d5..894f1e7 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -30,7 +30,7 @@ jobs: uses: actions/cache@v3 with: path: C:\ProgramData\chocolatey\lib - key: C:\ProgramData\chocolatey\lib + key: "ABCD" - name: Set Chocolatey cache location run: choco config set cacheLocation "C:\choco" From 85bcb65691c71c066f1260c3d7394ebc828cb1ed Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:27:37 -0400 Subject: [PATCH 47/84] updates --- .github/workflows/windows.yml | 86 +++++++++++++++++++---------------- 1 file changed, 47 insertions(+), 39 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 894f1e7..de33307 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -15,52 +15,60 @@ jobs: CMAKE_PREFIX_PATH: D:\a\wireshark\Qt\6.2.3\msvc2019_64 WIRESHARK_VERSION_EXTRA: -GithubActionBuild steps: - - name: Checkout - uses: actions/checkout@v4 - - name: Create cache directory - run: mkdir "C:\choco" + #- name: Checkout + # uses: actions/checkout@v4 + #- name: Create cache directory + # run: mkdir "C:\choco" - - name: cache - uses: actions/cache@v3 - with: - path: C:\choco - key: C:\choco + # - name: cache + # uses: actions/cache@v3 + # with: + # path: C:\choco + # key: C:\choco - name: cache - uses: actions/cache@v3 + id: cache-chocolatey + uses: actions/cache@v4 with: path: C:\ProgramData\chocolatey\lib key: "ABCD" + + - name: do we have git already? + if: steps.cache-chocolatey.outputs.cache-hit != 'true' + run: choco install -y git --force - - name: Set Chocolatey cache location - run: choco config set cacheLocation "C:\choco" + - name: use existing git + run: C:\ProgramData\chocolatey\lib\git\bin\git.exe - - name: install xsltproc - run: choco install -y xsltproc + #- name: Set Chocolatey cache location + #run: choco config set cacheLocation "C:\choco" - - name: checkout wireshark - run: cd wireshark/build-scripts/ && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - - name: Choco install - run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake - - name: Install strawberryperl - uses: shogo82148/actions-setup-perl@v1 - with: - perl-version: '5.30' - distribution: strawberry - - name: Add msbuild to PATH - uses: microsoft/setup-msbuild@v2 - with: - vs-version: 16.8 - - name: Mkdir - run: mkdir build - - name: Cmake - run: cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. - env: - PLATFORM: x64 - WIRESHARK_BASE_DIR: C:/wireshark-libs - QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 - working-directory: build - - name: Build - run: cmake --build . --config RelWithDebInfo - working-directory: build + #- name: install xsltproc + #run: choco install -y xsltproc + + #- name: checkout wireshark + #run: cd wireshark/build-scripts/ && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 + #- name: Choco install + #run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake + #- name: Install strawberryperl + #uses: shogo82148/actions-setup-perl@v1 + #with: + #perl-version: '5.30' + # distribution: strawberry + #- name: Add msbuild to PATH + #uses: microsoft/setup-msbuild@v2 + #with: + #vs-version: 16.8 + #- name: Mkdir + #run: mkdir build + #- name: Cmake + #run: cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. + #env: + #PLATFORM: x64 + #WIRESHARK_BASE_DIR: C:/wireshark-libs + #QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 + #working-directory: build + #- name: Build + #run: cmake --build . --config RelWithDebInfo + #working-directory: build From c05d6c921a199225d8642f6dd30e09a030d07816 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:35:58 -0400 Subject: [PATCH 48/84] updates --- .github/workflows/windows.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index de33307..8903382 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -15,8 +15,9 @@ jobs: CMAKE_PREFIX_PATH: D:\a\wireshark\Qt\6.2.3\msvc2019_64 WIRESHARK_VERSION_EXTRA: -GithubActionBuild steps: - #- name: Checkout - # uses: actions/checkout@v4 + - name: Checkout + uses: actions/checkout@v4 + #- name: Create cache directory # run: mkdir "C:\choco" From 47be74ad648db799184b4dcfbeb3c7fc6927d052 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:37:28 -0400 Subject: [PATCH 49/84] test --- wireshark/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wireshark/README.md b/wireshark/README.md index 82d99f6..a282f5d 100644 --- a/wireshark/README.md +++ b/wireshark/README.md @@ -61,3 +61,5 @@ The preference file is located in the following locations: ## Licensing See [Licensing](https://github.com/FoxIO-LLC/ja4/tree/main#licensing) under repo root. + +test From 7644a57ec614441a21755029752fe8838bf537a7 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:40:17 -0400 Subject: [PATCH 50/84] test --- wireshark/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/wireshark/README.md b/wireshark/README.md index a282f5d..84fec71 100644 --- a/wireshark/README.md +++ b/wireshark/README.md @@ -62,4 +62,3 @@ The preference file is located in the following locations: ## Licensing See [Licensing](https://github.com/FoxIO-LLC/ja4/tree/main#licensing) under repo root. -test From 921e64b9b2f2f06323f751f0eae241e28901e429 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:56:13 -0400 Subject: [PATCH 51/84] test --- wireshark/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/wireshark/README.md b/wireshark/README.md index 84fec71..a282f5d 100644 --- a/wireshark/README.md +++ b/wireshark/README.md @@ -62,3 +62,4 @@ The preference file is located in the following locations: ## Licensing See [Licensing](https://github.com/FoxIO-LLC/ja4/tree/main#licensing) under repo root. +test From 94d7de49b9efacada9a5aa92f0d73cb45de594ca Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:56:57 -0400 Subject: [PATCH 52/84] updates --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 8903382..5b236c5 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -36,10 +36,10 @@ jobs: - name: do we have git already? if: steps.cache-chocolatey.outputs.cache-hit != 'true' - run: choco install -y git --force + run: dir C:\ProgramData\chocolatey\lib - name: use existing git - run: C:\ProgramData\chocolatey\lib\git\bin\git.exe + run: dir C:\ProgramData\chocolatey\lib #- name: Set Chocolatey cache location #run: choco config set cacheLocation "C:\choco" From 7c2beacf9e0f37124ba41e6238f34335b40458cf Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:57:32 -0400 Subject: [PATCH 53/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5b236c5..919dffc 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -2,7 +2,7 @@ name: windows-build on: push: branches: [main] - paths: [wireshark/*, wireshark/source/*, wireshark/build-scripts/*] + paths: [wireshark/*, wireshark/source/*, wireshark/build-scripts/*, .github/workflows/*] workflow_dispatch: jobs: From c327ee4f9174eb6132765f5d3cca3c87deb9af50 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 12:58:40 -0400 Subject: [PATCH 54/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 919dffc..3f86e8e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -36,7 +36,7 @@ jobs: - name: do we have git already? if: steps.cache-chocolatey.outputs.cache-hit != 'true' - run: dir C:\ProgramData\chocolatey\lib + run: choco install -y git --force - name: use existing git run: dir C:\ProgramData\chocolatey\lib From 7e389e47cf8bcb526a460c785ec59ef785bcf1a7 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 13:00:45 -0400 Subject: [PATCH 55/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3f86e8e..0fdd601 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -39,7 +39,7 @@ jobs: run: choco install -y git --force - name: use existing git - run: dir C:\ProgramData\chocolatey\lib + run: dir C:\ProgramData\chocolatey\lib\git\ #- name: Set Chocolatey cache location #run: choco config set cacheLocation "C:\choco" From 219158fffe27c40debbb4c3f0449acd3c35c27b5 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 13:08:46 -0400 Subject: [PATCH 56/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0fdd601..a4d3af9 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -39,7 +39,7 @@ jobs: run: choco install -y git --force - name: use existing git - run: dir C:\ProgramData\chocolatey\lib\git\ + run: dir C:\ProgramData\chocolatey\lib\git\bin #- name: Set Chocolatey cache location #run: choco config set cacheLocation "C:\choco" From a1c8c5c713e195bdbc79fcadae161fa3b62ca143 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 13:13:15 -0400 Subject: [PATCH 57/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a4d3af9..3e69e90 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -39,7 +39,7 @@ jobs: run: choco install -y git --force - name: use existing git - run: dir C:\ProgramData\chocolatey\lib\git\bin + run: dir C:\ProgramData\chocolatey\lib\git #- name: Set Chocolatey cache location #run: choco config set cacheLocation "C:\choco" From 033b92acf25817e5d80ad9dbd2acb27c0d5e1905 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 13:54:26 -0400 Subject: [PATCH 58/84] updates --- .github/workflows/windows.yml | 50 ++++++++++++----------------------- 1 file changed, 17 insertions(+), 33 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 3e69e90..754949c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -18,45 +18,29 @@ jobs: - name: Checkout uses: actions/checkout@v4 - #- name: Create cache directory - # run: mkdir "C:\choco" - - # - name: cache - # uses: actions/cache@v3 - # with: - # path: C:\choco - # key: C:\choco + - name: Create cache directory + run: mkdir "C:\choco" - name: cache - id: cache-chocolatey - uses: actions/cache@v4 + uses: actions/cache@v3 with: - path: C:\ProgramData\chocolatey\lib - key: "ABCD" - - - name: do we have git already? - if: steps.cache-chocolatey.outputs.cache-hit != 'true' - run: choco install -y git --force - - - name: use existing git - run: dir C:\ProgramData\chocolatey\lib\git + path: C:\choco + key: C:\choco - #- name: Set Chocolatey cache location - #run: choco config set cacheLocation "C:\choco" + - name: Set Chocolatey cache location + run: choco config set cacheLocation "C:\choco" - #- name: install xsltproc - #run: choco install -y xsltproc + - name: checkout wireshark + run: cd wireshark/build-scripts/ && C:\Program/ Files\Git\bin\Git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - #- name: checkout wireshark - #run: cd wireshark/build-scripts/ && C:\choco-cache\git\bin\git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - #- name: Choco install - #run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake - #- name: Install strawberryperl - #uses: shogo82148/actions-setup-perl@v1 - #with: - #perl-version: '5.30' - # distribution: strawberry - #- name: Add msbuild to PATH + - name: Choco install + run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake + - name: Install strawberryperl + uses: shogo82148/actions-setup-perl@v1 + with: + perl-version: '5.30' + distribution: strawberry + #- name: Add msbuild to PATH #uses: microsoft/setup-msbuild@v2 #with: #vs-version: 16.8 From 935c9258e1f71bc9af03a057a6d626841306ad6e Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 13:55:24 -0400 Subject: [PATCH 59/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 754949c..7863afe 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -31,7 +31,7 @@ jobs: run: choco config set cacheLocation "C:\choco" - name: checkout wireshark - run: cd wireshark/build-scripts/ && C:\Program/ Files\Git\bin\Git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 + run: cd wireshark/build-scripts/ && C:\Program Files\Git\bin\Git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - name: Choco install run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake From e16c7e04d8e16479238ba5e4d1e5ee10e7142e05 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 13:56:37 -0400 Subject: [PATCH 60/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 7863afe..37a2775 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -31,7 +31,7 @@ jobs: run: choco config set cacheLocation "C:\choco" - name: checkout wireshark - run: cd wireshark/build-scripts/ && C:\Program Files\Git\bin\Git.exe clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 + run: cd wireshark/build-scripts/ && "C:\Program Files\Git\bin\git.exe" clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 - name: Choco install run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake From 9aeacae077949a5d9a3a486d609a50917037549c Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 14:00:38 -0400 Subject: [PATCH 61/84] updates --- .github/workflows/windows.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 37a2775..fd8225a 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -31,7 +31,12 @@ jobs: run: choco config set cacheLocation "C:\choco" - name: checkout wireshark - run: cd wireshark/build-scripts/ && "C:\Program Files\Git\bin\git.exe" clone -o upstream --branch wireshark-4.4.0 https://gitlab.com/wireshark/wireshark.git --depth=500 + uses: actions/checkout@v4 + with: + name: wireshark/wireshark + refs: release-4.4 + path: wireshark/build-scripts/ + - name: Choco install run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake From 30382401b8cea8e812ae3af9de4826b6072c2a34 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 14:02:48 -0400 Subject: [PATCH 62/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index fd8225a..0569bc0 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -33,7 +33,7 @@ jobs: - name: checkout wireshark uses: actions/checkout@v4 with: - name: wireshark/wireshark + repository: wireshark/wireshark refs: release-4.4 path: wireshark/build-scripts/ From 273d67a2a3666568d4dc1a1d06ad3cc1afcefe59 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 14:11:39 -0400 Subject: [PATCH 63/84] updates --- .github/workflows/windows.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0569bc0..0c2fccd 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -18,26 +18,13 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Create cache directory - run: mkdir "C:\choco" - - - name: cache - uses: actions/cache@v3 - with: - path: C:\choco - key: C:\choco - - - name: Set Chocolatey cache location - run: choco config set cacheLocation "C:\choco" - - name: checkout wireshark uses: actions/checkout@v4 with: repository: wireshark/wireshark - refs: release-4.4 + ref: release-4.4 path: wireshark/build-scripts/ - - name: Choco install run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake - name: Install strawberryperl From 1574a1fe376f891e4d8de1eaadbd19face34b1f6 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 14:35:53 -0400 Subject: [PATCH 64/84] updates --- .github/workflows/windows.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 0c2fccd..27eef3c 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -32,19 +32,19 @@ jobs: with: perl-version: '5.30' distribution: strawberry - #- name: Add msbuild to PATH - #uses: microsoft/setup-msbuild@v2 - #with: - #vs-version: 16.8 - #- name: Mkdir - #run: mkdir build - #- name: Cmake - #run: cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. - #env: - #PLATFORM: x64 - #WIRESHARK_BASE_DIR: C:/wireshark-libs - #QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 - #working-directory: build + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v2 + with: + vs-version: 16.8 + - name: Mkdir + run: mkdir build + - name: Cmake + run: cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. + env: + PLATFORM: x64 + WIRESHARK_BASE_DIR: C:/wireshark-libs + QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 + working-directory: build #- name: Build #run: cmake --build . --config RelWithDebInfo #working-directory: build From 45f6e063a361d2042b349d183b2e9e99c7cb53d4 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 14:36:23 -0400 Subject: [PATCH 65/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 27eef3c..5a31757 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -40,7 +40,7 @@ jobs: run: mkdir build - name: Cmake run: cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. - env: + env: PLATFORM: x64 WIRESHARK_BASE_DIR: C:/wireshark-libs QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 From 95bd77cc6bcd488831a860ca57a139f49377ebd9 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 14:45:51 -0400 Subject: [PATCH 66/84] updates --- .github/workflows/windows.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 5a31757..c6826eb 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -32,20 +32,30 @@ jobs: with: perl-version: '5.30' distribution: strawberry + + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + arch: win64_msvc2019_64 + version: 6.2.3 + modules: 'qt5compat' + - name: Add msbuild to PATH uses: microsoft/setup-msbuild@v2 with: vs-version: 16.8 + - name: Mkdir - run: mkdir build + run: mkdir wireshark/build-scripts/wireshark/build + - name: Cmake run: cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. env: PLATFORM: x64 WIRESHARK_BASE_DIR: C:/wireshark-libs QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 - working-directory: build - #- name: Build - #run: cmake --build . --config RelWithDebInfo - #working-directory: build + working-directory: wireshark/build-scripts/wireshark/build + - name: Build + run: cmake --build . --config RelWithDebInfo + working-directory: wireshark/build-scripts/wireshark/build From d0cda8dbfaffa63870105f88f5c62129a95a3049 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 14:53:01 -0400 Subject: [PATCH 67/84] updates --- .github/workflows/windows.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c6826eb..c48cf0e 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -49,13 +49,13 @@ jobs: run: mkdir wireshark/build-scripts/wireshark/build - name: Cmake - run: cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. + run: cd wireshark/build-scripts/wireshark/build && cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. env: PLATFORM: x64 WIRESHARK_BASE_DIR: C:/wireshark-libs QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 working-directory: wireshark/build-scripts/wireshark/build - name: Build - run: cmake --build . --config RelWithDebInfo + run: cd wireshark/build-scripts/wireshark/build && cmake --build . --config RelWithDebInfo working-directory: wireshark/build-scripts/wireshark/build From 1d439b2c955f78b7f4927623ed261f40d1e6332e Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 15:07:40 -0400 Subject: [PATCH 68/84] updates --- .github/workflows/windows.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c48cf0e..c2c3d87 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -12,20 +12,23 @@ jobs: env: PLATFORM: x64 WIRESHARK_BASE_DIR: C:\Development - CMAKE_PREFIX_PATH: D:\a\wireshark\Qt\6.2.3\msvc2019_64 + CMAKE_PREFIX_PATH: D:\a\ja4\Qt\6.2.3\msvc2019_64 WIRESHARK_VERSION_EXTRA: -GithubActionBuild steps: - - name: Checkout + - name: checkout this repo uses: actions/checkout@v4 + - name: create wireshark directory + run: mkdir wireshark/build-scripts/wireshark + - name: checkout wireshark uses: actions/checkout@v4 with: repository: wireshark/wireshark ref: release-4.4 - path: wireshark/build-scripts/ + path: wireshark/build-scripts/wireshark - - name: Choco install + - name: Choco install dependencies run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake - name: Install strawberryperl uses: shogo82148/actions-setup-perl@v1 @@ -45,11 +48,11 @@ jobs: with: vs-version: 16.8 - - name: Mkdir - run: mkdir wireshark/build-scripts/wireshark/build + - name: Mkdir build directory and copy sources + run: mkdir wireshark/build-scripts/wireshark/build - name: Cmake - run: cd wireshark/build-scripts/wireshark/build && cmake -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. + run: cd wireshark/build-scripts/wireshark/build && cmake -DCUSTOM_PLUGIN_SRC_DIR=plugins/epan/ja4 -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. env: PLATFORM: x64 WIRESHARK_BASE_DIR: C:/wireshark-libs From 9e646ce7a41bd697098e9c877e1fe08507b74025 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 15:17:34 -0400 Subject: [PATCH 69/84] updates --- .github/workflows/windows.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index c2c3d87..e68a531 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -28,6 +28,9 @@ jobs: ref: release-4.4 path: wireshark/build-scripts/wireshark + - name: add ja4 plugin + run: copy -r wireshark/source wireshark/build-scripts/wireshark/plugins/epan/ja4 + - name: Choco install dependencies run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake - name: Install strawberryperl From 8084993ae15f8a6429de5c8ad45a16bcd7221503 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 15:25:56 -0400 Subject: [PATCH 70/84] updates --- .github/workflows/windows.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index e68a531..77a328d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -29,7 +29,7 @@ jobs: path: wireshark/build-scripts/wireshark - name: add ja4 plugin - run: copy -r wireshark/source wireshark/build-scripts/wireshark/plugins/epan/ja4 + run: copy wireshark/build-scripts/CMakeLists.txt wireshark/build-scripts/wireshark/ && copy -r wireshark/source wireshark/build-scripts/wireshark/plugins/epan/ja4 - name: Choco install dependencies run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake From 505e01a3a1363eac163ddf61197a12cb97dcc0d7 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 15:35:22 -0400 Subject: [PATCH 71/84] updates --- .github/workflows/windows.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 77a328d..56c80f3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -29,7 +29,7 @@ jobs: path: wireshark/build-scripts/wireshark - name: add ja4 plugin - run: copy wireshark/build-scripts/CMakeLists.txt wireshark/build-scripts/wireshark/ && copy -r wireshark/source wireshark/build-scripts/wireshark/plugins/epan/ja4 + run: copy -r wireshark/source wireshark/build-scripts/wireshark/plugins/epan/ja4 - name: Choco install dependencies run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake @@ -51,6 +51,9 @@ jobs: with: vs-version: 16.8 + - name: Set MSVC command prompt + uses: ilammy/msvc-dev-cmd@v1 + - name: Mkdir build directory and copy sources run: mkdir wireshark/build-scripts/wireshark/build From 2598ebb74a87b372e4ef3ed97c02f0dbe8ac3a9a Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Wed, 18 Sep 2024 16:23:26 -0400 Subject: [PATCH 72/84] updates --- .github/workflows/windows.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 56c80f3..e1816a1 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -64,7 +64,8 @@ jobs: WIRESHARK_BASE_DIR: C:/wireshark-libs QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 working-directory: wireshark/build-scripts/wireshark/build + - name: Build - run: cd wireshark/build-scripts/wireshark/build && cmake --build . --config RelWithDebInfo + run: cmake --build . --config RelWithDebInfo working-directory: wireshark/build-scripts/wireshark/build From aea850b9464dd95bca17cb705fcf4782efe9d216 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 12:45:10 -0400 Subject: [PATCH 73/84] Update main.yml --- .github/workflows/main.yml | 59 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 33833cc..8b8bc30 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,4 +37,63 @@ jobs: GH_REPO: ${{ github.repository }} run: gh release upload ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/Wireshark.app/Contents/PlugIns/wireshark/4-4/epan/ja4.so#Mac-plugin + wireshark-windows: + runs-on: windows-2022 + env: + PLATFORM: x64 + WIRESHARK_BASE_DIR: C:\Development + CMAKE_PREFIX_PATH: D:\a\ja4\Qt\6.2.3\msvc2019_64 + WIRESHARK_VERSION_EXTRA: -GithubActionBuild + steps: + - name: set env + run: echo "NOW=$(date +'%Y.%m.%d.%M')" >> $GITHUB_ENV + - name: checkout + uses: actions/checkout@v4 + - name: create wireshark directory + run: mkdir wireshark/build-scripts/wireshark + - name: checkout wireshark + uses: actions/checkout@v4 + with: + repository: wireshark/wireshark + ref: release-4.4 + path: wireshark/build-scripts/wireshark + - name: add ja4 plugin + run: copy -r wireshark/source wireshark/build-scripts/wireshark/plugins/epan/ja4 + - name: Choco install dependencies + run: choco install -y asciidoctorj xsltproc docbook-bundle nsis winflexbison3 cmake + - name: Install strawberryperl + uses: shogo82148/actions-setup-perl@v1 + with: + perl-version: '5.30' + distribution: strawberry + - name: Install Qt + uses: jurplel/install-qt-action@v3 + with: + arch: win64_msvc2019_64 + version: 6.2.3 + modules: 'qt5compat' + - name: Add msbuild to PATH + uses: microsoft/setup-msbuild@v2 + with: + vs-version: 16.8 + - name: Set MSVC command prompt + uses: ilammy/msvc-dev-cmd@v1 + - name: Mkdir build directory and copy sources + run: mkdir wireshark/build-scripts/wireshark/build + - name: Cmake + run: cd wireshark/build-scripts/wireshark/build && cmake -DCUSTOM_PLUGIN_SRC_DIR=plugins/epan/ja4 -DCMAKE_SYSTEM_VERSION="10.0.20348.0" -A x64 .. + env: + PLATFORM: x64 + WIRESHARK_BASE_DIR: C:/wireshark-libs + QT5_BASE_DIR: C:/Qt/5.12.3/msvc2017_64 + working-directory: wireshark/build-scripts/wireshark/build + - name: Build + run: cmake --build . --config RelWithDebInfo + working-directory: wireshark/build-scripts/wireshark/build + - name: release + env: + GH_TOKEN: ${{ github.token }} + GH_REPO: ${{ github.repository }} + run: gh release upload ${{ env.NOW }} wireshark/build-scripts/wireshark/build/run/RelWithDebInfo/plugins/4.4/epan/ja4.dll#Windows + From 869cd90ac86a76fa49f1347fc7e564c285d051a0 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 12:45:59 -0400 Subject: [PATCH 74/84] testing build --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 21e715a..034fed1 100644 --- a/README.md +++ b/README.md @@ -197,3 +197,5 @@ And engineers working at GreyNoise, Hunt, Google, ExtraHop, F5, Driftnet and oth Contact John Althouse at john@foxio.io for licensing and questions. Copyright (c) 2024, FoxIO + +Testing build From 1aeeeadf0b7dec2d02f7a7040ea427fe75182a7c Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 12:47:02 -0400 Subject: [PATCH 75/84] wrong test --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 034fed1..93fc4b2 100644 --- a/README.md +++ b/README.md @@ -198,4 +198,3 @@ Contact John Althouse at john@foxio.io for licensing and questions. Copyright (c) 2024, FoxIO -Testing build From eb003be3ff53b71bef02b395f1ec66d99e5ccdfa Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 12:48:37 -0400 Subject: [PATCH 76/84] Update README.md --- wireshark/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/wireshark/README.md b/wireshark/README.md index a282f5d..d438b11 100644 --- a/wireshark/README.md +++ b/wireshark/README.md @@ -1,3 +1,4 @@ +Test # JA4+ Plugin for Wireshark ![JA4](https://github.com/FoxIO-LLC/ja4/blob/main/wireshark/screenshot.png) From 1c44e0094d54ac454527346d045c7788b25ab6de Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 16:01:17 -0400 Subject: [PATCH 77/84] Create test --- wireshark/binaries/test | 1 + 1 file changed, 1 insertion(+) create mode 100644 wireshark/binaries/test diff --git a/wireshark/binaries/test b/wireshark/binaries/test new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/wireshark/binaries/test @@ -0,0 +1 @@ +test From 0f39f4c9a268277f168a42d84d7630e8d4d58c0a Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 16:14:57 -0400 Subject: [PATCH 78/84] Create temp.yml --- .github/workflows/temp.yml | 47 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 .github/workflows/temp.yml diff --git a/.github/workflows/temp.yml b/.github/workflows/temp.yml new file mode 100644 index 0000000..408d927 --- /dev/null +++ b/.github/workflows/temp.yml @@ -0,0 +1,47 @@ +name: temp +on: + push: + branches: [main] + paths: [wireshark/*, wireshark/source/*, wireshark/build-scripts/*] + workflow_dispatch: + +jobs: + upload-one: + runs-on: ubuntu-latest + steps: + - name: touch one + run: echo "one" > one.txt + - name: upload one + uses: actions/upload-artifact@v4 + with: + name: upload-one + path: wireshark/binaries/one.txt + + upload-two: + runs-on: ubuntu-latest + steps: + - name: touch two + run: echo "two" > two.txt + - name: upload two + uses: actions/upload-artifact@v4 + with: + name: upload-two + path: wireshark/binaries/two.txt + + upload-all: + runs-on: ubuntu-latest + needs: [ upload-one, upload-two ] + steps: + - name: Download a single artifact + uses: actions/download-artifact@v4 + with: + name: upload-one + - name: Download a second artifact + uses: actions/download-artifact@v4 + with: + name: upload-two + - name: release + env: + GH_TOKEN: ${{ github.token }} + GH_REPO: ${{ github.repository }} + run: gh release create "test" one.txt two.txt From b7e3b6ef2c20130b1891d6d453fe5d23a6b40d40 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 16:16:29 -0400 Subject: [PATCH 79/84] Update temp.yml --- .github/workflows/temp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/temp.yml b/.github/workflows/temp.yml index 408d927..55ca836 100644 --- a/.github/workflows/temp.yml +++ b/.github/workflows/temp.yml @@ -11,7 +11,7 @@ jobs: steps: - name: touch one run: echo "one" > one.txt - - name: upload one + - name: upload-one uses: actions/upload-artifact@v4 with: name: upload-one @@ -22,7 +22,7 @@ jobs: steps: - name: touch two run: echo "two" > two.txt - - name: upload two + - name: upload-two uses: actions/upload-artifact@v4 with: name: upload-two From c861eb8a1a193991349ec15df5a21b0708117536 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 16:18:43 -0400 Subject: [PATCH 80/84] Update temp.yml --- .github/workflows/temp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/temp.yml b/.github/workflows/temp.yml index 55ca836..0ac9a92 100644 --- a/.github/workflows/temp.yml +++ b/.github/workflows/temp.yml @@ -15,7 +15,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: upload-one - path: wireshark/binaries/one.txt + path: one.txt upload-two: runs-on: ubuntu-latest @@ -26,7 +26,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: upload-two - path: wireshark/binaries/two.txt + path: two.txt upload-all: runs-on: ubuntu-latest From 197a72357feef60696779bc4bd4e59c475e7b227 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 16:30:53 -0400 Subject: [PATCH 81/84] Update temp.yml --- .github/workflows/temp.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/temp.yml b/.github/workflows/temp.yml index 0ac9a92..5f28267 100644 --- a/.github/workflows/temp.yml +++ b/.github/workflows/temp.yml @@ -21,12 +21,12 @@ jobs: runs-on: ubuntu-latest steps: - name: touch two - run: echo "two" > two.txt + run: echo "two" > one.txt - name: upload-two uses: actions/upload-artifact@v4 with: name: upload-two - path: two.txt + path: one.txt upload-all: runs-on: ubuntu-latest @@ -36,12 +36,17 @@ jobs: uses: actions/download-artifact@v4 with: name: upload-one + - name: release1 + env: + GH_TOKEN: ${{ github.token }} + GH_REPO: ${{ github.repository }} + run: gh release create "test" one.txt#Linux - name: Download a second artifact uses: actions/download-artifact@v4 with: name: upload-two - - name: release + - name: release2 env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release create "test" one.txt two.txt + run: gh release upload "test" one.txt#Mac From 0fa4df88b031c85e41ff45c8264f7513d2532844 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 16:50:01 -0400 Subject: [PATCH 82/84] Update main.yml --- .github/workflows/main.yml | 56 ++++++++++++++++++++++---------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8b8bc30..83f3946 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -1,4 +1,4 @@ -name: CICD +name: ja4-wireshark-release on: push: branches: [main] @@ -9,34 +9,33 @@ jobs: wireshark-linux: runs-on: ubuntu-latest steps: - - name: set env - run: echo "NOW=$(date +'%Y.%m.%d.%M')" >> $GITHUB_ENV - name: checkout uses: actions/checkout@v4 - name: build run: cd wireshark/build-scripts && sudo apt update -y && sudo apt install ninja-build -y && sudo ./linux_build.sh 4.4.0 - - name: release - env: - GH_TOKEN: ${{ github.token }} - GH_REPO: ${{ github.repository }} - run: gh release create ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so#Linux-plugin - - + - name: rename artifact + run: cp ./wireshark/build-scripts/wireshark-4.4.0/build/run/plugins/4.4/epan/ja4.so linux-ja4.so + - name: upload-linux-ja4 + uses: actions/upload-artifact@v4 + with: + name: linux-ja4 + path: linux-ja4.so + wireshark-macos: runs-on: macOS-latest steps: - - name: set env - run: echo "NOW=$(date +'%Y.%m.%d.%M')" >> $GITHUB_ENV - name: checkout uses: actions/checkout@v4 - name: build run: cd wireshark/build-scripts && ./macos_build.sh 4.4.0 - - name: release - env: - GH_TOKEN: ${{ github.token }} - GH_REPO: ${{ github.repository }} - run: gh release upload ${{ env.NOW }} ./wireshark/build-scripts/wireshark-4.4.0/build/run/Wireshark.app/Contents/PlugIns/wireshark/4-4/epan/ja4.so#Mac-plugin - + - name: rename artifact + run: cp ./wireshark/build-scripts/wireshark-4.4.0/build/run/Wireshark.app/Contents/PlugIns/wireshark/4-4/epan/ja4.so macos-ja4.so + - name: upload-linux-macos + uses: actions/upload-artifact@v4 + with: + name: macos-ja4 + path: macos-ja4.so + wireshark-windows: runs-on: windows-2022 env: @@ -45,8 +44,6 @@ jobs: CMAKE_PREFIX_PATH: D:\a\ja4\Qt\6.2.3\msvc2019_64 WIRESHARK_VERSION_EXTRA: -GithubActionBuild steps: - - name: set env - run: echo "NOW=$(date +'%Y.%m.%d.%M')" >> $GITHUB_ENV - name: checkout uses: actions/checkout@v4 - name: create wireshark directory @@ -90,10 +87,23 @@ jobs: - name: Build run: cmake --build . --config RelWithDebInfo working-directory: wireshark/build-scripts/wireshark/build + - name: rename artifact + run: cp wireshark/build-scripts/wireshark/build/run/RelWithDebInfo/plugins/4.4/epan/ja4.dll ja4.dll + - name: upload-linux-macos + uses: actions/upload-artifact@v4 + with: + name: windows-ja4 + path: ja4.dll + + release-artifacts: + runs-on: ubuntu-latest + steps: + - name: set env + run: echo "NOW=$(date +'%Y.%m.%d.%M')" >> $GITHUB_ENV + - name: download-artifacts + uses: actions/download-artifact@v4 - name: release env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release upload ${{ env.NOW }} wireshark/build-scripts/wireshark/build/run/RelWithDebInfo/plugins/4.4/epan/ja4.dll#Windows - - + run: gh release create ${{ env.NOW }} linux-ja4.so#Linux macos-ja4.so#Mac ja4.dll#Windows From cb06ad002dd5147fe58cfc6284428901897b3b69 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 16:51:37 -0400 Subject: [PATCH 83/84] Update main.yml --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 83f3946..fb2f0fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -97,6 +97,7 @@ jobs: release-artifacts: runs-on: ubuntu-latest + needs: [ wireshark-linux, wireshark-macos, wireshark-windows ] steps: - name: set env run: echo "NOW=$(date +'%Y.%m.%d.%M')" >> $GITHUB_ENV From 7e575134dd8cfcd9d652131d55d7edef20dc5ac1 Mon Sep 17 00:00:00 2001 From: Timothy Noel Date: Thu, 19 Sep 2024 17:16:05 -0400 Subject: [PATCH 84/84] Update main.yml --- .github/workflows/main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fb2f0fa..33b3667 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -30,7 +30,7 @@ jobs: run: cd wireshark/build-scripts && ./macos_build.sh 4.4.0 - name: rename artifact run: cp ./wireshark/build-scripts/wireshark-4.4.0/build/run/Wireshark.app/Contents/PlugIns/wireshark/4-4/epan/ja4.so macos-ja4.so - - name: upload-linux-macos + - name: upload-macos-ja4 uses: actions/upload-artifact@v4 with: name: macos-ja4 @@ -89,7 +89,7 @@ jobs: working-directory: wireshark/build-scripts/wireshark/build - name: rename artifact run: cp wireshark/build-scripts/wireshark/build/run/RelWithDebInfo/plugins/4.4/epan/ja4.dll ja4.dll - - name: upload-linux-macos + - name: upload-windows-ja4 uses: actions/upload-artifact@v4 with: name: windows-ja4 @@ -103,8 +103,10 @@ jobs: run: echo "NOW=$(date +'%Y.%m.%d.%M')" >> $GITHUB_ENV - name: download-artifacts uses: actions/download-artifact@v4 + - name: list files + run: ls -al - name: release env: GH_TOKEN: ${{ github.token }} GH_REPO: ${{ github.repository }} - run: gh release create ${{ env.NOW }} linux-ja4.so#Linux macos-ja4.so#Mac ja4.dll#Windows + run: gh release create ${{ env.NOW }} linux-ja4.so macos-ja4.so ja4.dll