diff options
| -rw-r--r-- | .github/workflows/android.yml | 6 | ||||
| -rwxr-xr-x | packaging/android/android-build-wrapper.sh | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 7a1ea65b1..b64f1b22f 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -11,7 +11,7 @@ jobs: buildInContainer: runs-on: ubuntu-latest container: - image: docker://subsurface/android-build-container:5.13.10 + image: docker://subsurface/android-build-container:5.13.12 steps: - name: checkout sources @@ -25,8 +25,8 @@ jobs: ln -s /android/android-sdk-linux . ls -l bash -x subsurface/packaging/android/android-build-wrapper.sh - cp /__w/subsurface/subsurface-mobile-build-arm64//build/outputs/apk/debug/subsurface-mobile-build-arm64-debug.apk ${GITHUB_WORKSPACE}/Subsurface-mobile.arm64.apk - cp /__w/subsurface/subsurface-mobile-build-arm//build/outputs/apk/debug/subsurface-mobile-build-arm-debug.apk ${GITHUB_WORKSPACE}/Subsurface-mobile.apk + cp /__w/subsurface/subsurface-mobile-build-arm64/*mobile*/build/outputs/apk/debug/subsurface-mobile-arm64-v8a-debug.apk ${GITHUB_WORKSPACE}/Subsurface-mobile.arm64.apk + cp /__w/subsurface/subsurface-mobile-build-arm/*mobile*/build/outputs/apk/debug/subsurface-mobile-armeabi-v7a-debug.apk ${GITHUB_WORKSPACE}/Subsurface-mobile.apk - name: create CI release if: github.event_name == 'push' diff --git a/packaging/android/android-build-wrapper.sh b/packaging/android/android-build-wrapper.sh index f7152596b..53b5e7e6f 100755 --- a/packaging/android/android-build-wrapper.sh +++ b/packaging/android/android-build-wrapper.sh @@ -178,5 +178,4 @@ else bash "$SUBSURFACE_SOURCE"/packaging/android/build.sh -buildnr "$BUILDNR" arm64 $QUICK $RELEASE fi -ls -l ./subsurface-mobile-build-arm/build/outputs/apk/debug/*.apk - +ls -l subsurface-mobile-build-arm*/*mobile*/build/outputs/apk/*/*.apk |