Github actions fixes

This commit is contained in:
pokamest 2023-06-29 17:38:04 -07:00
parent 4a4c9cd63f
commit 0dba9b8268
2 changed files with 10 additions and 10 deletions

View file

@ -9,8 +9,8 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env: env:
QT_VERSION: 6.5.0 QT_VERSION: 6.5.1
QIF_VERSION: 4.5 QIF_VERSION: 4.6
steps: steps:
- name: 'Install Qt' - name: 'Install Qt'
@ -63,8 +63,8 @@ jobs:
runs-on: windows-latest runs-on: windows-latest
env: env:
QT_VERSION: 6.5.0 QT_VERSION: 6.5.1
QIF_VERSION: 4.5 QIF_VERSION: 4.6
BUILD_ARCH: 64 BUILD_ARCH: 64
steps: steps:
@ -124,7 +124,7 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
env: env:
QT_VERSION: 6.5.0 QT_VERSION: 6.5.1
steps: steps:
- name: 'Setup xcode' - name: 'Setup xcode'
@ -199,8 +199,8 @@ jobs:
runs-on: macos-latest runs-on: macos-latest
env: env:
QT_VERSION: 6.5.0 QT_VERSION: 6.5.1
QIF_VERSION: 4.5 QIF_VERSION: 4.6
steps: steps:
- name: 'Setup xcode' - name: 'Setup xcode'
@ -262,7 +262,7 @@ jobs:
arch: ['android_x86_64', 'android_x86'] #, 'android_armv7', 'android_arm64_v8a'] arch: ['android_x86_64', 'android_x86'] #, 'android_armv7', 'android_arm64_v8a']
env: env:
QT_VERSION: 6.5.0 QT_VERSION: 6.5.1
steps: steps:
- name: 'Install desktop Qt' - name: 'Install desktop Qt'

View file

@ -38,8 +38,8 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}.dmg
# Search Qt # Search Qt
if [ -z "${QT_VERSION+x}" ]; then if [ -z "${QT_VERSION+x}" ]; then
QT_VERSION=6.4.1; QT_VERSION=6.5.1;
QIF_VERSION=4.1 QIF_VERSION=4.6
QT_BIN_DIR=$HOME/Qt/$QT_VERSION/macos/bin QT_BIN_DIR=$HOME/Qt/$QT_VERSION/macos/bin
QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin
fi fi