mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

CICD: Fix GitHub Actions.

Browse source 
Fix the setting of environment variables in the android build.
Also fix a typo in the AppImage build.

Signed-off-by: Michael Keller <mikeller@042.ch>
This commit is contained in:
Michael Keller 2024-01-10 13:42:09 -08:00 • committed by Dirk Hohndel
parent 53f6d1d606
commit 506a96f1f6
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/android.yml vendored
View file

@ -60,10 +60,10 @@ jobs:
git config --global --add safe.directory $GITHUB_WORKSPACE/libdivecomputer git config --global --add safe.directory $GITHUB_WORKSPACE/libdivecomputer
# get the build number via curl so this works both for a pull request as well as a push # get the build number via curl so this works both for a pull request as well as a push
BUILDNR=$(curl -q https://raw.githubusercontent.com/subsurface/nightly-builds/main/latest-subsurface-buildnumber) BUILDNR=$(curl -q https://raw.githubusercontent.com/subsurface/nightly-builds/main/latest-subsurface-buildnumber)
OUTPUT_DIR="$GITHUB_WORKSPACE" export OUTPUT_DIR="$GITHUB_WORKSPACE"
KEYSTORE_FILE="$KEYSTORE_FILE" export KEYSTORE_FILE="$KEYSTORE_FILE"
KEYSTORE_PASSWORD="pass:${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" export KEYSTORE_PASSWORD="pass:${{ secrets.ANDROID_KEYSTORE_PASSWORD }}"
KEYSTORE_ALIAS="${{ secrets.ANDROID_KEYSTORE_ALIAS }}" export KEYSTORE_ALIAS="${{ secrets.ANDROID_KEYSTORE_ALIAS }}"
bash -x ./subsurface/packaging/android/qmake-build.sh -buildnr ${BUILDNR} bash -x ./subsurface/packaging/android/qmake-build.sh -buildnr ${BUILDNR}
# only publish a 'release' on push events (those include merging a PR) # only publish a 'release' on push events (those include merging a PR)