From 004e1e3ca535e4cc7615be1124e271a922204a82 Mon Sep 17 00:00:00 2001
From: pokamest <pokamest@gmail.com>
Date: Mon, 26 Feb 2024 02:44:28 -0800
Subject: [PATCH] MacOS GH actions QIF fix (#645)

Install Qt Installer Framework 4.6 from R2 to keep compatibility for old MacOS. In addition, update Qt version in build scripts.
---
 .github/workflows/deploy.yml | 9 +++++++--
 deploy/build_ios.sh          | 2 +-
 deploy/build_linux.sh        | 2 +-
 deploy/build_macos.sh        | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 952df01c..f14d1622 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -227,7 +227,7 @@ jobs:
     env:
       # Keep compat with MacOS 10.15 aka Catalina by Qt 6.4
       QT_VERSION: 6.4.3
-      QIF_VERSION: 4.7
+      QIF_VERSION: 4.6
 
     steps:
     - name: 'Setup xcode'
@@ -245,10 +245,15 @@ jobs:
         modules: 'qtremoteobjects qt5compat qtshadertools'
         dir: ${{ runner.temp }}
         setup-python: 'true'
-        tools: 'tools_ifw'
         set-env: 'true'
         extra: '--external 7z --base ${{ env.QT_MIRROR }}'
 
+    - name: 'Install Qt Installer Framework ${{ env.QIF_VERSION }}'
+      run: |
+        mkdir -pv ${{ runner.temp }}/Qt/Tools/QtInstallerFramework
+        wget https://qt.amzsvc.com/tools/ifw/${{ env.QIF_VERSION }}.zip
+        unzip ${{ env.QIF_VERSION }}.zip -d ${{ runner.temp }}/Qt/Tools/QtInstallerFramework/
+
     - name: 'Get sources'
       uses: actions/checkout@v4
       with:
diff --git a/deploy/build_ios.sh b/deploy/build_ios.sh
index 7f16b916..5dc11ff1 100755
--- a/deploy/build_ios.sh
+++ b/deploy/build_ios.sh
@@ -20,7 +20,7 @@ PLIST_NAME=$APP_NAME.plist
 
 # Search Qt
 if [ -z "${QT_VERSION+x}" ]; then
-  QT_VERSION=6.5.2;
+  QT_VERSION=6.6.2;
   QT_BIN_DIR=$HOME/Qt/$QT_VERSION/ios/bin
 fi
 
diff --git a/deploy/build_linux.sh b/deploy/build_linux.sh
index c90e781a..57217a1e 100755
--- a/deploy/build_linux.sh
+++ b/deploy/build_linux.sh
@@ -36,7 +36,7 @@ QMAKE_STASH_FILE=$PROJECT_DIR/.qmake_stash
 
 # Search Qt
 if [ -z "${QT_VERSION+x}" ]; then
-  QT_VERSION=5.15.2
+  QT_VERSION=6.6.2
   if [ -f /opt/Qt/$QT_VERSION/gcc_64/bin/qmake ]; then
     QT_BIN_DIR=/opt/Qt/$QT_VERSION/gcc_64/bin
   elif [ -f $HOME/Qt/$QT_VERSION/gcc_64/bin/qmake ]; then
diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh
index ffdbd20b..5f6e9786 100755
--- a/deploy/build_macos.sh
+++ b/deploy/build_macos.sh
@@ -37,7 +37,7 @@ DMG_FILENAME=$PROJECT_DIR/${APP_NAME}.dmg
 
 # Search Qt
 if [ -z "${QT_VERSION+x}" ]; then
-QT_VERSION=6.5.1;
+QT_VERSION=6.4.3;
 QIF_VERSION=4.6
 QT_BIN_DIR=$HOME/Qt/$QT_VERSION/macos/bin
 QIF_BIN_DIR=$QT_BIN_DIR/../../../Tools/QtInstallerFramework/$QIF_VERSION/bin