CI: modify ANDROID_ABI

KangLin · Feb 26, 2024 · 9d127b6 · 9d127b6
1 parent 9f00e61
commit 9d127b6
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -17,11 +17,11 @@ jobs:
         include:
           - qt_arch: android_arm64_v8a
             VCPKG_TARGET_TRIPLET: arm64-android
-            config_arch: arm64_v8a
+            ANDROID_ABI: arm64_v8a
 
           - qt_arch: android_x86_64 
             VCPKG_TARGET_TRIPLET: x64-android
-            config_arch: x86_64
+            ANDROID_ABI: x86_64
 
     runs-on: ubuntu-latest
 
@@ -132,6 +132,7 @@ jobs:
               -DQT_HOST_PATH=${Qt6_DIR}/../gcc_64 \
               -DANDROID_PLATFORM=${{env.ANDROID_PLATFORM}} \
               -DANDROID_NATIVE_API_LEVEL=${{env.ANDROID_NATIVE_API_LEVEL}} \
+              -DANDROID_ABI=${matrix.ANDROID_ABI}} \
               -DQT_ANDROID_SIGN_APK=ON \
               -DQT_ENABLE_VERBOSE_DEPLOYMENT=ON \
               -DQt6LinguistTools_DIR=${Qt6_DIR}/../gcc_64/lib/cmake/Qt6LinguistTools \
@@ -146,7 +147,7 @@ jobs:
           ${{env.SOURCE_DIR}}/RabbitCommon/Install/GenerateJsonFile.sh \
             update_${{matrix.qt_arch}}_${{matrix.qt_version}}.json \
             SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk \
-            android ${{matrix.config_arch}} \
+            android ${{matrix.ANDROID_ABI}} \
             "https://github.com/KangLin/SerialPortAssistant/releases/download/${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk,https://sourceforge.net/projects/SerialPortAssistant/files/${{env.SerialPortAssistant_VERSION}}/SerialPortAssistant_${{env.SerialPortAssistant_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk"
 
       - name: update