From 71097f57c29745319f9eb7656e3b332ea40126fb Mon Sep 17 00:00:00 2001 From: Stefan Poindl Date: Wed, 4 Feb 2026 16:50:50 +0100 Subject: [PATCH] fix android app version getting lost --- .github/workflows/android-release.yml | 7 +++++++ .github/workflows/cd.yml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml index 6ddc6c73..2a65febd 100644 --- a/.github/workflows/android-release.yml +++ b/.github/workflows/android-release.yml @@ -124,6 +124,13 @@ jobs: NDK_HOME: ${{ steps.setup-ndk.outputs.ndk-path }} run: cargo tauri android init + - name: Restore committed Android version properties + run: | + # cargo tauri android init overwrites tauri.properties - restore the committed version + git checkout HEAD -- src-tauri/gen/android/app/tauri.properties 2>/dev/null || echo "No committed tauri.properties found" + echo "Android version properties:" + cat src-tauri/gen/android/app/tauri.properties + - name: Generate Android icons working-directory: src-tauri run: cargo tauri icon icons/icon.png diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index f6d82fa8..02a65d6b 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -100,7 +100,7 @@ jobs: git config user.name "github-actions[bot]" git config user.email "github-actions[bot]@users.noreply.github.com" git add package.json src-tauri/Cargo.toml src-tauri/tauri.conf.json - git add src-tauri/gen/android/app/tauri.properties || true + git add --force src-tauri/gen/android/app/tauri.properties git commit -m "chore: bump version to ${{ needs.generate-version.outputs.version }} [skip ci]" || echo "No changes to commit" git push || echo "Nothing to push"