mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 05:00:20 +00:00
Build system: Fix Local Build Script for android.
Change the name of the `GITHUB_WORKSPACE` environment variable in the android build script to `OUTPUT_DIR`, which is more intuitive when the script is used for local builds. Also test if the variable is defined before attempting to use it as the target of the build output. Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
parent
733ffb787a
commit
b3d2a8cdcb
2 changed files with 5 additions and 2 deletions
2
.github/workflows/android.yml
vendored
2
.github/workflows/android.yml
vendored
|
@ -55,7 +55,7 @@ jobs:
|
|||
apt-get install --reinstall cpp-7 gcc-7-base libgcc-7-dev libcc1-0 gcc-7
|
||||
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
|
||||
OUTPUT_DIR=$GITHUB_WORKSPACE bash -x ./subsurface/packaging/android/qmake-build.sh
|
||||
|
||||
- name: create version number
|
||||
id: version_number
|
||||
|
|
|
@ -404,4 +404,7 @@ fi
|
|||
|
||||
# now build the Subsurface aab
|
||||
make apk
|
||||
mv $(find . -name Subsurface-mobile.apk) "$GITHUB_WORKSPACE"/Subsurface-mobile-"$CANONICALVERSION".apk
|
||||
|
||||
if [ -n "${OUTPUT_DIR+X}" ] ; then
|
||||
mv $(find . -name Subsurface-mobile.apk) "$OUTPUT_DIR"/Subsurface-mobile-"$CANONICALVERSION".apk
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue