Fixed release version numbering for Android

This commit is contained in:
OpenSauce04 2024-04-02 14:26:03 +01:00 committed by OpenSauce
parent cbbdc26624
commit fd4bc9002f
2 changed files with 2 additions and 4 deletions

View File

@ -1,9 +1,7 @@
#!/bin/bash -ex #!/bin/bash -ex
export NDK_CCACHE=$(which ccache) export NDK_CCACHE=$(which ccache)
[ "$GITHUB_REPOSITORY" = "citra-emu/citra-canary" ] && BUILD_FLAVOR=nightly
BUILD_FLAVOR=canary ||
BUILD_FLAVOR=nightly
if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then if [ ! -z "${ANDROID_KEYSTORE_B64}" ]; then
export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks" export ANDROID_KEYSTORE_FILE="${GITHUB_WORKSPACE}/ks.jks"

View File

@ -198,7 +198,7 @@ jobs:
${{ runner.os }}-android- ${{ runner.os }}-android-
- name: Set tag name - name: Set tag name
run: | run: |
if [[ "$GITHUB_REF_NAME" =~ ^canary- ]] || [[ "$GITHUB_REF_NAME" =~ ^nightly- ]]; then if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV echo "GIT_TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV
fi fi
echo $GIT_TAG_NAME echo $GIT_TAG_NAME