From 48fa785681107e4237ade3bee45f2fd66fc8e4aa Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 3 Sep 2026 02:01:49 +0000 Subject: [PATCH 1/2] Update actions/upload-artifact action to v7 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c4b7b4..52fc6af 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -59,7 +59,7 @@ jobs: ./gradlew assembleSignedRelease -PVERSION_CODE=$VERSION_CODE -PVERSION_NAME=$VERSION_NAME - name: Upload APK - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v7 with: name: Cowspent-APK path: app/build/outputs/apk/signedRelease/app-signedRelease.apk From e91fd05bac24429e6c43f6e46b3a598fcb23db02 Mon Sep 17 00:00:00 2001 From: choelzl Date: Thu, 3 Sep 2026 11:58:19 +0200 Subject: [PATCH 2/2] Update .github/workflows/build.yml --- .github/workflows/build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2c4b7b4..f30bac8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,7 +55,13 @@ jobs: - name: Build APK run: | VERSION_CODE=$(git rev-list --count HEAD) - VERSION_NAME=$(git describe --tags --always) + VERSION_BASE=$(git describe --tags --abbrev=0 | sed 's/^v//') + VERSION_DEV=$(git rev-list --count $(git describe --tags --abbrev=0)..HEAD) + if [ $VERSION_DEV -gt 0 ]; then + VERSION_NAME="${VERSION_BASE}.${VERSION_DEV}" + else + VERSION_NAME="${VERSION_BASE}" + fi ./gradlew assembleSignedRelease -PVERSION_CODE=$VERSION_CODE -PVERSION_NAME=$VERSION_NAME - name: Upload APK