diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index bf45cc499..ea2b2f79d 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -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 }} diff --git a/deploy/build.sh b/deploy/build.sh index 511be17ea..b9cb083e9 100755 --- a/deploy/build.sh +++ b/deploy/build.sh @@ -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