From 2e5171c205da945a5f82610f63d5c8540587728b Mon Sep 17 00:00:00 2001
From: "vladimir.kuznetsov" <astanaar1@gmail.com>
Date: Sun, 27 Nov 2022 12:32:45 +0300
Subject: [PATCH] added matrix for all android arch

---
 .github/workflows/deploy.yml | 58 +++++++++++++++++++++++-------------
 client/client.pro            |  5 +++-
 deploy/build_android.sh      |  1 -
 deploy/build_ios.sh          |  4 ---
 deploy/build_macos.sh        |  2 --
 5 files changed, 41 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 0e500a61..d466d6cc 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -46,23 +46,11 @@ jobs:
   Build-Windows:
     name: Build-Windows
     runs-on: windows-latest
-    continue-on-error: true
-
-    strategy:
-      matrix:
-        arch: [64]
-        include:
-          - qt-arch: 'win64_msvc2019_64'
-            arch: 64
-          - qt-msvc-path: 'msvc2019_64'
-            arch: 64
-          - msvc-arch: 'x64'
-            arch: 64
 
     env:
       QT_VERSION: 6.4.1
       QIF_VERSION: 4.5
-      BUILD_ARCH: ${{ matrix.arch }}
+      BUILD_ARCH: 64
 
     steps:
     - name: 'Get sources'
@@ -80,7 +68,7 @@ jobs:
         version: ${{ env.QT_VERSION }}
         host: 'windows'
         target: 'desktop'
-        arch: '${{ matrix.qt-arch }}'
+        arch: 'win64_msvc2019_64'
         modules: 'qtremoteobjects qt5compat'
         dir: ${{ runner.temp }}
         setup-python: 'true'
@@ -91,13 +79,13 @@ jobs:
     - name: 'Setup mvsc'
       uses: ilammy/msvc-dev-cmd@v1
       with:
-          arch: ${{ matrix.msvc-arch }}
+          arch: 'x64'
 
     - name: 'Build project'
       shell: cmd
       run: |
         set BUILD_ARCH=${{ env.BUILD_ARCH }}
-        set QT_BIN_DIR="${{ runner.temp }}\\Qt\\${{ env.QT_VERSION }}\\${{ matrix.qt-msvc-path }}\\bin"
+        set QT_BIN_DIR="${{ runner.temp }}\\Qt\\${{ env.QT_VERSION }}\\msvc2019_64\\bin"
         set QIF_BIN_DIR="${{ runner.temp }}\\Qt\\Tools\\QtInstallerFramework\\${{ env.QIF_VERSION }}\\bin"
         call deploy\\build_windows.bat
 
@@ -117,7 +105,18 @@ jobs:
       with:
         xcode-version: '13.4'
 
-    - name: 'Install Qt'
+    - name: 'Install desktop Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'mac'
+        target: 'desktop'
+        arch: 'clang_64'
+        modules: 'qtremoteobjects qt5compat'
+        dir: ${{ runner.temp }}
+        set-env: 'true'
+
+    - name: 'Install ios Qt'
       uses: jurplel/install-qt-action@v3
       with:
         version: ${{ env.QT_VERSION }}
@@ -128,7 +127,6 @@ jobs:
         setup-python: 'true'
         set-env: 'true'
         extra: '--external 7z'
-        aqtversion: '==3.0.*'
 
     - name: 'Install go'
       uses: actions/setup-go@v3
@@ -205,19 +203,37 @@ jobs:
   Build-Android:
     name: 'Build-Android'
     runs-on: ubuntu-latest
+    continue-on-error: true
+
+    strategy:
+      matrix:
+        arch: ['android_x86_64', 'android_x86'] #, 'android_armv7', 'android_arm64_v8a']
 
     env:
       QT_VERSION: 6.4.1
       QIF_VERSION: 4.5
 
     steps:
-    - name: 'Install Qt'
+    - name: 'Install desktop Qt'
+      uses: jurplel/install-qt-action@v3
+      with:
+        version: ${{ env.QT_VERSION }}
+        host: 'linux'
+        target: 'desktop'
+        arch: 'gcc_64'
+        modules: 'qtremoteobjects qt5compat'
+        dir: ${{ runner.temp }}
+        setup-python: 'true'
+        set-env: 'true'
+        extra: '--external 7z'
+
+    - name: 'Install android Qt'
       uses: jurplel/install-qt-action@v3
       with:
         version: ${{ env.QT_VERSION }}
         host: 'linux'
         target: 'android'
-        arch: 'android'
+        arch: ${{ matrix.arch }}
         modules: 'qtremoteobjects qt5compat'
         dir: ${{ runner.temp }}
         setup-python: 'true'
@@ -251,5 +267,5 @@ jobs:
           unzip -q -d ${{ runner.temp }} ${{ runner.temp }}/ndk.zip ; 
         fi
 
-        export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/android/bin
+        export QT_BIN_DIR=${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/${{ matrix.arch }}/bin
         bash deploy/build_android.sh
\ No newline at end of file
diff --git a/client/client.pro b/client/client.pro
index 021cf80b..ab0db693 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -8,7 +8,7 @@ TEMPLATE = app
 IS_CI=$$(CI)
 !isEmpty(IS_CI){
   message("Detected CI env")
-  CONFIG += silent ccache
+  CONFIG += silent #ccache
 }
 
 CONFIG += qtquickcompiler
@@ -248,6 +248,9 @@ android {
         # As QAndroidBinder is not yet implemented with a public api
         QT+=core-private
         ANDROID_ABIS=ANDROID_TARGET_ARCH
+
+        # for not changing qtkeychain sources for qt6
+        QT -= androidextras
     }
     else {
         QT += androidextras
diff --git a/deploy/build_android.sh b/deploy/build_android.sh
index 75e8c46c..e8799394 100644
--- a/deploy/build_android.sh
+++ b/deploy/build_android.sh
@@ -36,7 +36,6 @@ echo "Using Qt in $QT_BIN_DIR"
 echo "Using Android SDK in $ANDROID_SDK_ROOT"
 echo "Using Android NDK in $ANDROID_NDK_ROOT"
 
-
 # Checking env
 $QT_BIN_DIR/qmake -v
 $ANDROID_NDK_HOME/prebuilt/linux-x86_64/bin/make -v
diff --git a/deploy/build_ios.sh b/deploy/build_ios.sh
index 793facbe..994a96ed 100644
--- a/deploy/build_ios.sh
+++ b/deploy/build_ios.sh
@@ -1,10 +1,6 @@
 #!/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
diff --git a/deploy/build_macos.sh b/deploy/build_macos.sh
index 22c2a4dd..09dd85f7 100755
--- a/deploy/build_macos.sh
+++ b/deploy/build_macos.sh
@@ -1,8 +1,6 @@
 #!/bin/bash
 echo "Build script started ..."
 
-ls $QT_BIN_DIR
-
 set -o errexit -o nounset
 
 while getopts n: flag