From 0dba9b826888b6e53991257417b0cb76343bbdae Mon Sep 17 00:00:00 2001 From: pokamest Date: Thu, 29 Jun 2023 17:38:04 -0700 Subject: [PATCH] Github actions fixes --- .github/workflows/deploy.yml | 16 ++++++++-------- deploy/build_macos.sh | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index e5cea7a3..cf8553fc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,8 +9,8 @@ jobs: runs-on: ubuntu-latest env: - QT_VERSION: 6.5.0 - QIF_VERSION: 4.5 + QT_VERSION: 6.5.1 + QIF_VERSION: 4.6 steps: - name: 'Install Qt' @@ -63,8 +63,8 @@ jobs: runs-on: windows-latest env: - QT_VERSION: 6.5.0 - QIF_VERSION: 4.5 + QT_VERSION: 6.5.1 + QIF_VERSION: 4.6 BUILD_ARCH: 64 steps: @@ -124,7 +124,7 @@ jobs: runs-on: macos-latest env: - QT_VERSION: 6.5.0 + QT_VERSION: 6.5.1 steps: - name: 'Setup xcode' @@ -199,8 +199,8 @@ jobs: runs-on: macos-latest env: - QT_VERSION: 6.5.0 - QIF_VERSION: 4.5 + QT_VERSION: 6.5.1 + QIF_VERSION: 4.6 steps: - name: 'Setup xcode' @@ -262,7 +262,7 @@ jobs: arch: ['android_x86_64', 'android_x86'] #, 'android_armv7', 'android_arm64_v8a'] env: - QT_VERSION: 6.5.0 + QT_VERSION: 6.5.1 steps: - name: 'Install desktop Qt' diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh index 7e58db41..1a163ae1 100755 --- a/deploy/build_macos.sh +++ b/deploy/build_macos.sh @@ -38,8 +38,8 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}.dmg # Search Qt if [ -z "${QT_VERSION+x}" ]; then -QT_VERSION=6.4.1; -QIF_VERSION=4.1 +QT_VERSION=6.5.1; +QIF_VERSION=4.6 QT_BIN_DIR=$HOME/Qt/$QT_VERSION/macos/bin QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin fi