From 3c0648b84d39886979dcf2149a6312735d34828c Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Wed, 6 Mar 2024 12:57:34 -0800 Subject: [PATCH 01/13] Bump Qt to 6.5.2 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a7b3a214..d427b673 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ on: pull_request: branches: [ main ] env: - QT_VERSION: 6.5.2 + QT_VERSION: 6.6.2 jobs: # This is a super hacky way to get this into a place that can actually be # used by downstream jobs because YAML values don't allow shell From adb1b52ade10b8d865315bc78e9ce54ff08a2a7e Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Wed, 6 Mar 2024 15:04:30 -0800 Subject: [PATCH 02/13] Fix dep issue --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d427b673..5cd2e543 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -153,7 +153,8 @@ jobs: -e src/ashirt \ -d ../deploy/ashirt.desktop \ -i ../deploy/hicolor/128x128/apps/ashirt.png \ - --plugin=qt + --plugin=qt \ + --exclude-libs libmimeapi.so elif [[ "$RUNNER_OS" == "macOS" && "${{ env.signMacRelease }}" == "true" ]]; then brew tap mitchellh/gon brew install mitchellh/gon/gon jq From 1afffaa35fed5db8f6b16899807de48a8cc9bd17 Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Wed, 6 Mar 2024 15:13:54 -0800 Subject: [PATCH 03/13] More fixes --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 5cd2e543..6c6cfd84 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -154,7 +154,7 @@ jobs: -d ../deploy/ashirt.desktop \ -i ../deploy/hicolor/128x128/apps/ashirt.png \ --plugin=qt \ - --exclude-libs libmimeapi.so + --exclude-library=libmimeapi.so elif [[ "$RUNNER_OS" == "macOS" && "${{ env.signMacRelease }}" == "true" ]]; then brew tap mitchellh/gon brew install mitchellh/gon/gon jq From 1aaa0db19eab8e7558f4445c8e19a0bc0da90760 Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Wed, 6 Mar 2024 15:22:22 -0800 Subject: [PATCH 04/13] Ugh --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 6c6cfd84..28ba8559 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -154,7 +154,7 @@ jobs: -d ../deploy/ashirt.desktop \ -i ../deploy/hicolor/128x128/apps/ashirt.png \ --plugin=qt \ - --exclude-library=libmimeapi.so + --exclude-library=libmimerapi.so elif [[ "$RUNNER_OS" == "macOS" && "${{ env.signMacRelease }}" == "true" ]]; then brew tap mitchellh/gon brew install mitchellh/gon/gon jq From 58ab0dae7fbb144027f2480c1de06a198d3039ca Mon Sep 17 00:00:00 2001 From: John Kennedy <65985482+jkennedyvz@users.noreply.github.com> Date: Thu, 7 Mar 2024 16:16:27 -0800 Subject: [PATCH 05/13] ignoring upstream library --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 28ba8559..a1beaf84 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -154,7 +154,7 @@ jobs: -d ../deploy/ashirt.desktop \ -i ../deploy/hicolor/128x128/apps/ashirt.png \ --plugin=qt \ - --exclude-library=libmimerapi.so + --exclude-library=libqsqlmimer.so elif [[ "$RUNNER_OS" == "macOS" && "${{ env.signMacRelease }}" == "true" ]]; then brew tap mitchellh/gon brew install mitchellh/gon/gon jq From 6f7eac00865b54cbfb83bb396512aa47178976b6 Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Tue, 2 Apr 2024 14:05:31 -0700 Subject: [PATCH 06/13] Bump to 6.7.0 --- .github/workflows/ci.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a1beaf84..3d1fca74 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ on: pull_request: branches: [ main ] env: - QT_VERSION: 6.6.2 + QT_VERSION: 6.7.0 jobs: # This is a super hacky way to get this into a place that can actually be # used by downstream jobs because YAML values don't allow shell @@ -153,8 +153,7 @@ jobs: -e src/ashirt \ -d ../deploy/ashirt.desktop \ -i ../deploy/hicolor/128x128/apps/ashirt.png \ - --plugin=qt \ - --exclude-library=libqsqlmimer.so + --plugin=qt elif [[ "$RUNNER_OS" == "macOS" && "${{ env.signMacRelease }}" == "true" ]]; then brew tap mitchellh/gon brew install mitchellh/gon/gon jq From ec0e9c602e23ec7859b41cf2c345c7fa8f041c27 Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Mon, 20 May 2024 11:20:44 -0700 Subject: [PATCH 07/13] Use newer versions of deps --- .github/workflows/ci.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3d1fca74..8a3305b9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -117,8 +117,6 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4.0.0 with: - aqtversion: ==2.0.0 - py7zrversion: ==0.16.2 dir: ${{matrix.config.QT_INST_DIR}} arch: ${{ matrix.config.QT_ARCH }} version: ${{ env.QT_VERSION }} From e2a0c89ec79c1627156c6b82fc6a477427b812af Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Mon, 20 May 2024 11:35:16 -0700 Subject: [PATCH 08/13] Exclude sqlmimerapi --- .github/workflows/ci.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8a3305b9..aa301930 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -151,7 +151,8 @@ jobs: -e src/ashirt \ -d ../deploy/ashirt.desktop \ -i ../deploy/hicolor/128x128/apps/ashirt.png \ - --plugin=qt + --plugin=qt \ + --exclude-plugin=qsqlmimer elif [[ "$RUNNER_OS" == "macOS" && "${{ env.signMacRelease }}" == "true" ]]; then brew tap mitchellh/gon brew install mitchellh/gon/gon jq From 36a0223a6ac5167ff1cfc642f18c08d72453736e Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Mon, 20 May 2024 11:43:52 -0700 Subject: [PATCH 09/13] Fix sqlmimer again --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index aa301930..304f4597 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -152,7 +152,7 @@ jobs: -d ../deploy/ashirt.desktop \ -i ../deploy/hicolor/128x128/apps/ashirt.png \ --plugin=qt \ - --exclude-plugin=qsqlmimer + --exclude-library=qsqlmimer elif [[ "$RUNNER_OS" == "macOS" && "${{ env.signMacRelease }}" == "true" ]]; then brew tap mitchellh/gon brew install mitchellh/gon/gon jq From c8df3854ea082739aa4ef2efdb6515b57a6322a8 Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Mon, 20 May 2024 11:53:07 -0700 Subject: [PATCH 10/13] Bump more --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 304f4597..a7b22ba5 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -152,7 +152,7 @@ jobs: -d ../deploy/ashirt.desktop \ -i ../deploy/hicolor/128x128/apps/ashirt.png \ --plugin=qt \ - --exclude-library=qsqlmimer + --exclude-library=libqsqlmimer elif [[ "$RUNNER_OS" == "macOS" && "${{ env.signMacRelease }}" == "true" ]]; then brew tap mitchellh/gon brew install mitchellh/gon/gon jq From 94c623400fd0453ba472f805d14e29f8d677b422 Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Tue, 21 May 2024 14:11:36 -0700 Subject: [PATCH 11/13] Bump to 6.7.1 --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a7b22ba5..f92e6b1b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ on: pull_request: branches: [ main ] env: - QT_VERSION: 6.7.0 + QT_VERSION: 6.7.1 jobs: # This is a super hacky way to get this into a place that can actually be # used by downstream jobs because YAML values don't allow shell From 3a51109c13504f95c56942b856db38e34ddb9534 Mon Sep 17 00:00:00 2001 From: Joe Rozner Date: Tue, 21 May 2024 14:24:12 -0700 Subject: [PATCH 12/13] Remove signature? --- src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7ceee49e..9764e64e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -73,6 +73,7 @@ if(APPLE) TARGET ashirt POST_BUILD COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/ashirt.app/Contents/Frameworks COMMAND install ${HOMEBREW_CELLAR}/brotli/1.1.0/lib/libbrotlicommon.1.1.0.dylib ${CMAKE_CURRENT_BINARY_DIR}/ashirt.app/Contents/Frameworks/libbrotlicommon.1.dylib + COMMAND codesign --remove-signature ${CMAKE_CURRENT_BINARY_DIR}/ashirt.app/Contents/Frameworks/libbrotlicommon.1.dylib COMMAND codesign -v --timestamp --sign ${NOTARIZE_AS} ${CMAKE_CURRENT_BINARY_DIR}/ashirt.app/Contents/Frameworks/libbrotlicommon.1.dylib COMMAND ${PLATFORMDEPLOYQT} ${CMAKE_CURRENT_BINARY_DIR}/ashirt.app -sign-for-notarization=${NOTARIZE_AS} ) From 6937ccc733b5580e047363de1fd5e0e20d75c558 Mon Sep 17 00:00:00 2001 From: pookie Date: Tue, 4 Jun 2024 00:07:26 -0700 Subject: [PATCH 13/13] testing updated plugin --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f92e6b1b..d7595506 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -143,7 +143,7 @@ jobs: mkdir -p dist if [ "$RUNNER_OS" == "Linux" ]; then wget -qc "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" - wget -qc "https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage" + wget -qc "https://github.com/jkennedyvz/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-static-x86_64.AppImage" -O linuxdeploy-plugin-qt-x86_64.AppImage chmod a+x linuxdeploy*.AppImage export VERSION=${{ env.githash }} export PATH=$PATH:/opt/Qt/${{env.QT_VERSION}}/gcc_64/libexec