add android config

.github/workflows/backup/android-qt5_15_2.yml → .github/workflows/android-qt5_15_2.yml

@@ -28,26 +28,19 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        # 5.9.8 版本低，需要额外设置工具链。这里暂不支持。
         qt_ver: [5.15.2]
         qt_target: [android]
-        # qt_arch: [android_x86,android_armv7,android_arm64_v8a]
-        # android_arm64_v8a 暂时不支持. install-qt-action 依赖的aqtinstall版本为0.5*,需要升级
-        # qt_arch: [android_x86,android_armv7]
-        # exclude:
-        #   - qt_ver: 5.9.8
-        #     qt_arch: android_arm64_v8a
+
     steps:
-      - name: Install Qt
-        # if: steps.cacheqt.outputs.cache-hit != 'true'
+      - name: Install Qt 5.15.2
         uses: jurplel/[email protected]
         with:
           # Version of Qt to install
           version: ${{ matrix.qt_ver }}
           # Target platform for build
-          target: ${{ matrix.qt_target }}
+          target: android
           # Architecture for Windows/Android
-          # arch: ${{ matrix.qt_arch }}
+          # arch: ${{ matrix.qt_arch }}          
       - uses: actions/checkout@v1
         with:
           fetch-depth: 1

.github/workflows/android.yml

@@ -6,58 +6,41 @@ on:
       - 'LICENSE'
       - "doc/**"
       - "preview/**"
-      - ".github/workflows/ios.yml"
-      - ".github/workflows/macos.yml"
-      - ".github/workflows/ubuntu.yml"
-      - ".github/workflows/windows.yml"      
+      - ".github/workflows/ios*.yml"
+      - ".github/workflows/macos*.yml"
+      - ".github/workflows/ubuntu*.yml"
+      - ".github/workflows/windows*.yml"      
   # pull_request时触发workflow
   pull_request:
     paths-ignore:
       - 'README.md'
       - 'LICENSE'
       - "doc/**"
       - "preview/**"  
-      - ".github/workflows/ios.yml"
-      - ".github/workflows/macos.yml"
-      - ".github/workflows/ubuntu.yml"
-      - ".github/workflows/windows.yml"          
+      - ".github/workflows/ios*.yml"
+      - ".github/workflows/macos*.yml"
+      - ".github/workflows/ubuntu*.yml"
+      - ".github/workflows/windows*.yml"          
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        include:
-          - qt_ver: 5.12.10
-            qt_arch: android_x86
-          - qt_ver: 5.12.10
-            qt_arch: android_armv7
-          - qt_ver: 5.12.10
-            qt_arch: android_arm64_v8a            
-          - qt_ver: 5.15.2
-            qt_arch: ''
-
+        os: [ubuntu-20.04]
+        qt_ver: [5.12.10]
+        qt_target: [android]
+        qt_arch: [android_x86,android_armv7,android_arm64_v8a]
     steps:
       - name: Install Qt 5.12.10
-        if: ${{ matrix.qt_ver }} == '5.12.10'
         uses: jurplel/[email protected]
         with:
           # Version of Qt to install
           version: ${{ matrix.qt_ver }}
           # Target platform for build
-          target: android
+          target: ${{ matrix.qt_target }}
           # Architecture for Windows/Android
           arch: ${{ matrix.qt_arch }}
-      - name: Install Qt 5.15.2
-        if: ${{ matrix.qt_ver }} == '5.15.2'
-        uses: jurplel/[email protected]
-        with:
-          # Version of Qt to install
-          version: ${{ matrix.qt_ver }}
-          # Target platform for build
-          target: android
-          # Architecture for Windows/Android
-          # arch: ${{ matrix.qt_arch }}          
       - uses: actions/checkout@v1
         with:
           fetch-depth: 1