Skip to content

Commit 381a18c

Browse files
authored
Merge pull request #24 from usetrmnl/adb-connect-d8vk
CI: commit version bump back to main
2 parents 772d90e + a155b59 commit 381a18c

2 files changed

Lines changed: 15 additions & 2 deletions

File tree

.github/workflows/build-apk.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,19 @@ jobs:
5757
chmod +x tools/set-version.sh
5858
tools/set-version.sh "${GITHUB_REF_NAME}"
5959
60+
- name: Commit version bump to main
61+
if: startsWith(github.ref, 'refs/tags/')
62+
shell: bash
63+
run: |
64+
set -euo pipefail
65+
git config user.name "github-actions[bot]"
66+
git config user.email "github-actions[bot]@users.noreply.github.com"
67+
if ! git diff --quiet AndroidManifest.xml; then
68+
git add AndroidManifest.xml
69+
git commit -m "Bump version to ${GITHUB_REF_NAME#v}"
70+
git push origin HEAD:main
71+
fi
72+
6073
- name: Configure release signing
6174
if: startsWith(github.ref, 'refs/tags/')
6275
shell: bash

AGENTS/release.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ bump so users expect meaningful change.
2626
Suggested guidance to give users:
2727
- Ensure `main` is clean and up to date.
2828
- **Do NOT run `set-version.sh` locally or commit version bumps.** CI stamps
29-
the manifest automatically from the tag. Running it locally on a feature
30-
branch creates a misleading versionCode that diverges from the release.
29+
the manifest automatically from the tag and commits the bump back to `main`.
30+
Running it locally creates a misleading versionCode that diverges from the release.
3131
- Create and push the tag **on `main`**:
3232
- `git tag v0.1.0`
3333
- `git push origin main --tags`

0 commit comments

Comments
 (0)