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

Another Fix for the android Action.

Browse source 
Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
Michael Keller 2024-01-10 07:25:23 +13:00
parent deab622c3e
commit 867d31bcbc
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,13 +33,13 @@ jobs:
id: version_number
if: github.event_name == 'push'
run: |
version=$(bash scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release")
version="$(bash scripts/get-atomic-buildnr.sh ${{ github.sha }} ${{ secrets.NIGHTLY_BUILDS }} "CICD-release")"
echo "version=$version" >> $GITHUB_OUTPUT
pr_num=${{ steps.get_pr.outputs.number }}
pr_url=${{ steps.get_pr.outputs.html_url }}
pr_title=${{ steps.get_pr.outputs.title }}
commit_id=${{ github.event.head_commit.id }}
commit_url=${{ github.event.head_commit.url }}
pr_num="${{ steps.get_pr.outputs.number }}"
pr_url="${{ steps.get_pr.outputs.html_url }}"
pr_title="${{ steps.get_pr.outputs.title }}"
commit_id="${{ github.event.head_commit.id }}"
commit_url="${{ github.event.head_commit.url }}"
bash scripts/create-releasenotes.sh "$pr_num" "$pr_url" "$pr_title" "$commit_id" "$commit_url"
- name: store dummy version and build number for non-push build runs
@ -73,7 +73,11 @@ jobs:
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
BUILDNR=$(curl -q https://raw.githubusercontent.com/subsurface/nightly-builds/main/latest-subsurface-buildnumber)
OUTPUT_DIR=$GITHUB_WORKSPACE KEYSTORE_FILE="$KEYSTORE_FILE" KEYSTORE_PASSWORD="pass:${{ secrets.ANDROID_KEYSTORE_PASSWORD }}" KEYSTORE_ALIAS="${{ secrets.ANDROID_KEYSTORE_ALIAS }}" bash -x ./subsurface/packaging/android/qmake-build.sh -buildnr ${BUILDNR}
OUTPUT_DIR="$GITHUB_WORKSPACE"
KEYSTORE_FILE="$KEYSTORE_FILE"
KEYSTORE_PASSWORD="pass:${{ secrets.ANDROID_KEYSTORE_PASSWORD }}"
KEYSTORE_ALIAS="${{ secrets.ANDROID_KEYSTORE_ALIAS }}"
bash -x ./subsurface/packaging/android/qmake-build.sh -buildnr ${BUILDNR}
# only publish a 'release' on push events (those include merging a PR)
- name: upload binaries