From 813dced6df4ef05c25bac74a8c0ea712f02c16f9 Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <astanaar1@gmail.com>
Date: Sun, 27 Nov 2022 01:30:36 +0300
Subject: [PATCH] added qt6 modules installation to github actions

---
 .github/workflows/deploy.yml | 15 +++++++--------
 deploy/build_ios.sh          |  4 ++++
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index e04520c8..15674b32 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -19,6 +19,7 @@ jobs:
         host: 'linux'
         target: 'desktop'
         arch: 'gcc_64'
+        modules: 'qtremoteobjects qt5compat'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         tools: 'tools_ifw'
@@ -49,14 +50,8 @@ jobs:
 
     strategy:
       matrix:
-        arch: [32, 64]
+        arch: [64]
         include:
-          - qt-arch: 'win32_msvc2019'
-            arch: 32
-          - qt-msvc-path: 'msvc2019'
-            arch: 32
-          - msvc-arch: 'x86'
-            arch: 32
           - qt-arch: 'win64_msvc2019_64'
             arch: 64
           - qt-msvc-path: 'msvc2019_64'
@@ -86,6 +81,7 @@ jobs:
         host: 'windows'
         target: 'desktop'
         arch: '${{ matrix.qt-arch }}'
+        modules: 'qtremoteobjects qt5compat'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         tools: 'tools_ifw'
@@ -127,10 +123,12 @@ jobs:
         version: ${{ env.QT_VERSION }}
         host: 'mac'
         target: 'ios'
+        modules: 'qtremoteobjects qt5compat'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         set-env: 'true'
         extra: '--external 7z'
+        aqtversion: '==3.0.*'
 
     - name: 'Install go'
       uses: actions/setup-go@v3
@@ -180,6 +178,7 @@ jobs:
         host: 'mac'
         target: 'desktop'
         arch: 'clang_64'
+        modules: 'qtremoteobjects qt5compat'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         tools: 'tools_ifw'
@@ -219,7 +218,7 @@ jobs:
         host: 'linux'
         target: 'android'
         arch: 'android'
-        modules: 'qtcharts qtdatavis3d qtpurchasing qtnetworkauth qtscript'
+        modules: 'qtremoteobjects qt5compat'
         dir: ${{ runner.temp }}
         setup-python: 'true'
         set-env: 'true'
diff --git a/deploy/build_ios.sh b/deploy/build_ios.sh
index 994a96ed..793facbe 100644
--- a/deploy/build_ios.sh
+++ b/deploy/build_ios.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 echo "Build script started ..."
 
+ls "/Users/runner/work/_temp/Qt/6.4.0/"
+# sed 's/macos/ios/' /Users/runner/work/_temp/Qt/6.4.0/ios/bin/qmake > /Users/runner/work/_temp/Qt/6.4.0/ios/bin/qmake
+cat /Users/runner/work/_temp/Qt/6.4.0/ios/bin/qmake
+
 set -o errexit -o nounset
 
 # Hold on to current directory