@@ -152,20 +152,37 @@ jobs:
152152 release-for-android :
153153 runs-on : ubuntu-24.04
154154 needs : update-release
155+ strategy :
156+ fail-fast : false
157+ matrix :
158+ ci_action : [
159+ ' armv7' ,
160+ ' armv8a'
161+ ]
155162 steps :
156163 - name : Checkout
157164 uses : actions/checkout@v4
158- - name : Setup cmake
159- uses : jwlawson/actions-setup-cmake@v2
160- with :
161- cmake-version : ' 4.1.x'
162- - name : Build for Android
165+ - name : Build for Android(armv7)
166+ if : ${{ matrix.ci_action == 'armv7' }}
163167 run : |
164168 docker pull ${{ env.DOCKER_IMAGE }}
165169 docker run --rm -v ${{ github.workspace }}:/workspace ${{ env.DOCKER_IMAGE }} /bin/bash -c "\
166170 cd /workspace && chmod +x ./scripts/ci-build-android-armv7.sh && ./scripts/ci-build-android-armv7.sh \
167171 ${{env.QT_ANDROID_KEYSTORE_PATH}} ${{env.QT_ANDROID_KEYSTORE_ALIAS}} ${{env.QT_ANDROID_KEYSTORE_STORE_PASS}} ${{env.QT_ANDROID_KEYSTORE_KEY_PASS}}"
168- - name : Upload Release Asset for Android
172+ - name : Upload Release Asset for Android(armv7)
173+ if : ${{ matrix.ci_action == 'armv7' }}
169174 run : |
170175 cmake -E copy build/armeabi_v7a/android-build/build/outputs/apk/release/android-build-release-signed.apk xtools-android-armeabi_v7a.apk
171176 ls && tree build/armeabi_v7a && gh release upload ${{ github.ref_name }} xtools-android-armeabi_v7a.apk
177+ - name : Build for Android(armv8a)
178+ if : ${{ matrix.ci_action == 'armv8a' }}
179+ run : |
180+ docker pull ${{ env.DOCKER_IMAGE }}
181+ docker run --rm -v ${{ github.workspace }}:/workspace ${{ env.DOCKER_IMAGE }} /bin/bash -c "\
182+ cd /workspace && chmod +x ./scripts/ci-build-android-armv8a.sh && ./scripts/ci-build-android-armv8a.sh \
183+ ${{env.QT_ANDROID_KEYSTORE_PATH}} ${{env.QT_ANDROID_KEYSTORE_ALIAS}} ${{env.QT_ANDROID_KEYSTORE_STORE_PASS}} ${{env.QT_ANDROID_KEYSTORE_KEY_PASS}}"
184+ - name : Upload Release Asset for Android(armv8a)
185+ if : ${{ matrix.ci_action == 'armv8a' }}
186+ run : |
187+ cmake -E copy build/arm64_v8a/android-build/build/outputs/apk/release/android-build-release-signed.apk xtools-android-arm64_v8a.apk
188+ ls && tree build/arm64_v8a && gh release upload ${{ github.ref_name }} xtools-android-arm64_v8a.apk
0 commit comments