andrei/amnezia-client
1
0
Fork 0
mirror of https://github.com/amnezia-vpn/amnezia-client.git synced 2026-06-23 02:00:20 +07:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: CI/CD correct QT paths

Browse Source
This commit is contained in:
Yaroslav Gurov
2026-04-16 16:11:02 +02:00
parent 526a7cad89
commit a7734d6093
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/deploy.yml
+3
View File
@@ -59,6 +59,8 @@ jobs:
- name: 'Build project' - name: 'Build project'
shell: bash shell: bash
env:
QT_INSTALL_DIR: ${{ runner.temp }}
run: ./deploy/build.sh run: ./deploy/build.sh
- name: 'Upload installer artifact' - name: 'Upload installer artifact'
@@ -425,6 +427,7 @@ jobs:
- name: 'Build project' - name: 'Build project'
env: env:
QT_INSTALL_DIR: ${{ runner.temp }}
CODESIGN_KEYCHAIN: ${{ env.KEYCHAIN_NAME }} CODESIGN_KEYCHAIN: ${{ env.KEYCHAIN_NAME }}
CODESIGN_SIGNATURE: ${{ secrets.MAC_SIGNER_ID }} CODESIGN_SIGNATURE: ${{ secrets.MAC_SIGNER_ID }}
CODESIGN_INSTALLER_KEYCHAIN: ${{ env.KEYCHAIN_NAME }} CODESIGN_INSTALLER_KEYCHAIN: ${{ env.KEYCHAIN_NAME }}
deploy/build.sh
+4 -1
View File
@@ -4,9 +4,12 @@ set -o errexit
PROJECT_DIR=$(pwd) PROJECT_DIR=$(pwd)
BUILD_DIR="$PROJECT_DIR/deploy/build" BUILD_DIR="$PROJECT_DIR/deploy/build"
bases=(~/Qt /opt/Qt)
[ -n "${QT_INSTALL_DIR}" ] && bases+=("${QT_INSTALL_DIR}/Qt")
qt_folders=() qt_folders=()
qif_folders=() qif_folders=()
for base in ~/Qt /opt/Qt; do for base in "${bases[@]}"; do
for dir in "$base"/${QT_VERSION:-6.*}; do for dir in "$base"/${QT_VERSION:-6.*}; do
[ -d "$dir" ] && qt_folders+=("$dir") [ -d "$dir" ] && qt_folders+=("$dir")
done done