Skip to content

Commit 72a0c45

Browse files
committed
build,ci: allow to specify a array of target ABIs
1 parent 47b6910 commit 72a0c45

File tree

3 files changed

+3
-13
lines changed

3 files changed

+3
-13
lines changed

.github/workflows/commit-ci.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,8 @@ jobs:
1313
- ubuntu-22.04
1414
- macos-13
1515
- windows-2022
16-
abi:
17-
- armeabi-v7a
18-
- arm64-v8a
19-
- x86
20-
- x86_64
2116
env:
22-
BUILD_ABI: ${{ matrix.abi }}
17+
BUILD_ABI: armeabi-v7a,arm64-v8a,x86,x86_64
2318
steps:
2419
- name: Fetch source code
2520
uses: actions/checkout@v4

.github/workflows/pull-request-ci.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,8 @@ jobs:
2020
- ubuntu-22.04
2121
- macos-13
2222
- windows-2022
23-
abi:
24-
- armeabi-v7a
25-
- arm64-v8a
26-
- x86
27-
- x86_64
2823
env:
29-
BUILD_ABI: ${{ matrix.abi }}
24+
BUILD_ABI: armeabi-v7a,arm64-v8a,x86,x86_64
3025
steps:
3126
- name: Fetch source code
3227
uses: actions/checkout@v4

build-logic/convention/src/main/kotlin/NativeBaseConventionPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ open class NativeBaseConventionPlugin : Plugin<Project> {
4444
abi {
4545
isEnable = true
4646
reset()
47-
include(target.buildABI)
47+
include(*target.buildABI.split(',').toTypedArray())
4848
isUniversalApk = false
4949
}
5050
}

0 commit comments

Comments
 (0)