build,ci: allow to specify a array of target ABIs

WhiredPlanck · Jan 15, 2024 · 9c01f60 · 9c01f60
1 parent f7e9a04
commit 9c01f60
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git a/.github/workflows/commit-ci.yml b/.github/workflows/commit-ci.yml
@@ -13,13 +13,8 @@ jobs:
           - ubuntu-22.04
           - macos-13
           - windows-2022
-        abi:
-          - armeabi-v7a
-          - arm64-v8a
-          - x86
-          - x86_64
     env:
-      BUILD_ABI: ${{ matrix.abi }}
+      BUILD_ABI: armeabi-v7a,arm64-v8a,x86,x86_64
     steps:
       - name: Fetch source code
         uses: actions/checkout@v4

diff --git a/.github/workflows/pull-request-ci.yml b/.github/workflows/pull-request-ci.yml
@@ -20,13 +20,8 @@ jobs:
           - ubuntu-22.04
           - macos-13
           - windows-2022
-        abi:
-          - armeabi-v7a
-          - arm64-v8a
-          - x86
-          - x86_64
     env:
-      BUILD_ABI: ${{ matrix.abi }}
+      BUILD_ABI: armeabi-v7a,arm64-v8a,x86,x86_64
     steps:
       - name: Fetch source code
         uses: actions/checkout@v4

diff --git a/build-logic/convention/src/main/kotlin/NativeBaseConventionPlugin.kt b/build-logic/convention/src/main/kotlin/NativeBaseConventionPlugin.kt
@@ -44,7 +44,7 @@ open class NativeBaseConventionPlugin : Plugin<Project> {
                     abi {
                         isEnable = true
                         reset()
-                        include(target.buildABI)
+                        include(*target.buildABI.split(',').toTypedArray())
                         isUniversalApk = false
                     }
                 }