chore: update the building script

x-tools-author · Nov 25, 2023 · 68b3f26 · 68b3f26
1 parent 1fd6128
commit 68b3f26
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -4,32 +4,39 @@ on: push
 #    - cron: '0 0 * * *'
 env:
   CMAKE_MAKE_PROGRAM: ${{ github.workspace }}/resources/tools/ninja.exe
-
+  QT_VERSION: 6.5.3
+  QT_MODULES: 'qtcharts qtserialbus qtserialport qtwebsockets'
 jobs:
   build:
     name: Build
     runs-on: windows-2019
-    strategy:
-      matrix:
-        target: [android]
-        arch: [android_armv7]
-        version: [6.5.3]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-      - name: Install Qt
+      - name: Install Qt for Android
         uses: jurplel/install-qt-action@v3
         with:
-          version: ${{ matrix.version }}
-          target: ${{ matrix.target }}
-          arch: ${{ matrix.arch }}
+          target: android
+          arch: android_armv7
+          host: windows
           dir: ${{ github.workspace }}
-          modules: 'qtcharts qtserialbus qtserialport qtwebsockets'
+          modules: ${{env.QT_MODULES}}
+          version: ${{env.QT_VERSION}}
+      - name: Install Qt for Desktop(mingw)
+        uses: jurplel/install-qt-action@v3
+        with:
+          target: desktop
+          arch: win64_mingw
+          host: windows
+          dir: ${{ github.workspace }}
+          modules: ${{env.QT_MODULES}}
+          version: "${{env.QT_VERSION}}"
       - name: Build for Android
         shell: cmd
         run: |
           set JAVA_HOME=%JAVA_HOME_11_X64%
-          ${{ github.workspace }}\Qt\${{matrix.version}}\${{matrix.arch}}\bin\qt-cmake.bat ^
+          set QT_HOST_PATH=${{ github.workspace }}\Qt\${{env.QT_VERSION}}\win64_mingw
+          ${{ github.workspace }}\Qt\${{env.QT_VERSION}}\android_armv7\bin\qt-cmake.bat ^
           -G Ninja ^
           -S . ^
           -B "build\armeabi_v7a" ^