Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .github/workflows/android-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading