From c609bc9446e6d8cfe04e643e0e7a23106291dc63 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Thu, 7 Dec 2023 02:53:14 -0800 Subject: [PATCH] more logical naming for the Android apk Signed-off-by: Dirk Hohndel --- .github/workflows/android.yml | 4 +--- packaging/android/qmake-build.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index d65036f91..61daa584c 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -51,8 +51,6 @@ jobs: git config --global --add safe.directory ${SUBSURFACE_REPO_PATH} git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer bash -x ./subsurface/packaging/android/qmake-build.sh - artifacts=$(find $(pwd) -name \*.apk) - echo "artifacts=$artifacts" >> $GITHUB_OUTPUT - name: upload binaries uses: softprops/action-gh-release@v1 @@ -62,4 +60,4 @@ jobs: body: CICD release artifact fail_on_unmatched_files: false files: | - ${{ steps.build.ouputs.artifacts }} + Subsurface-mobile*.apk diff --git a/packaging/android/qmake-build.sh b/packaging/android/qmake-build.sh index 18f20a4ee..c471a467d 100755 --- a/packaging/android/qmake-build.sh +++ b/packaging/android/qmake-build.sh @@ -404,4 +404,4 @@ fi # now build the Subsurface aab make aab - +mv subsurface-mobile-build/android-build/build/outputs/apk/debug/android-build-debug.apk Subsurface-mobile-"$CANONICAL_VERSION".apk