mirror of
https://github.com/amnezia-vpn/amnezia-client.git
synced 2026-05-08 14:33:23 +00:00
fix: CI/CD correct QT paths
This commit is contained in:
3
.github/workflows/deploy.yml
vendored
3
.github/workflows/deploy.yml
vendored
@@ -59,6 +59,8 @@ jobs:
|
||||
|
||||
- name: 'Build project'
|
||||
shell: bash
|
||||
env:
|
||||
QT_INSTALL_DIR: ${{ runner.temp }}
|
||||
run: ./deploy/build.sh
|
||||
|
||||
- name: 'Upload installer artifact'
|
||||
@@ -425,6 +427,7 @@ jobs:
|
||||
|
||||
- name: 'Build project'
|
||||
env:
|
||||
QT_INSTALL_DIR: ${{ runner.temp }}
|
||||
CODESIGN_KEYCHAIN: ${{ env.KEYCHAIN_NAME }}
|
||||
CODESIGN_SIGNATURE: ${{ secrets.MAC_SIGNER_ID }}
|
||||
CODESIGN_INSTALLER_KEYCHAIN: ${{ env.KEYCHAIN_NAME }}
|
||||
|
||||
@@ -4,9 +4,12 @@ set -o errexit
|
||||
PROJECT_DIR=$(pwd)
|
||||
BUILD_DIR="$PROJECT_DIR/deploy/build"
|
||||
|
||||
bases=(~/Qt /opt/Qt)
|
||||
[ -n "${QT_INSTALL_DIR}" ] && bases+=("${QT_INSTALL_DIR}/Qt")
|
||||
|
||||
qt_folders=()
|
||||
qif_folders=()
|
||||
for base in ~/Qt /opt/Qt; do
|
||||
for base in "${bases[@]}"; do
|
||||
for dir in "$base"/${QT_VERSION:-6.*}; do
|
||||
[ -d "$dir" ] && qt_folders+=("$dir")
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user