Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jk/test deploy #257

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Jk/test deploy #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3c0648b
Bump Qt to 6.5.2
jrozner Mar 6, 2024
adb1b52
Fix dep issue
jrozner Mar 6, 2024
1afffaa
More fixes
jrozner Mar 6, 2024
1aaa0db
Ugh
jrozner Mar 6, 2024
58ab0da
ignoring upstream library
jkennedyvz Mar 8, 2024
6f7eac0
Bump to 6.7.0
jrozner Apr 2, 2024
ec0e9c6
Use newer versions of deps
jrozner May 20, 2024
e2a0c89
Exclude sqlmimerapi
jrozner May 20, 2024
36a0223
Fix sqlmimer again
jrozner May 20, 2024
c8df385
Bump more
jrozner May 20, 2024
94c6234
Bump to 6.7.1
jrozner May 21, 2024
3a51109
Remove signature?
jrozner May 21, 2024
6937ccc
testing updated plugin
Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
pull_request:
branches: [ main ]
env:
QT_VERSION: 6.5.2
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
Expand Down Expand Up @@ -117,8 +117,6 @@ jobs:
- name: Install Qt
uses: jurplel/[email protected]
with:
aqtversion: ==2.0.0
py7zrversion: ==0.16.2
dir: ${{matrix.config.QT_INST_DIR}}
arch: ${{ matrix.config.QT_ARCH }}
version: ${{ env.QT_VERSION }}
Expand All @@ -145,15 +143,16 @@ 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
./linuxdeploy-x86_64.AppImage --appdir=appdir --output appimage \
-e src/ashirt \
-d ../deploy/ashirt.desktop \
-i ../deploy/hicolor/128x128/apps/ashirt.png \
--plugin=qt
--plugin=qt \
--exclude-library=libqsqlmimer
elif [[ "$RUNNER_OS" == "macOS" && "${{ env.signMacRelease }}" == "true" ]]; then
brew tap mitchellh/gon
brew install mitchellh/gon/gon jq
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)
Expand Down
Loading