Merge pull request #10 from Helldez/ci/tag-driven-version

ci: derive release version from the git tag (no manual bump, no release PR)

Author: Helldez

.github/workflows/android-apk.yml

@@ -30,6 +30,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # full history so `git rev-list --count` yields a real versionCode
 
       - name: Setup JDK 17
         uses: actions/setup-java@v4
@@ -55,6 +57,18 @@ jobs:
       - name: Bundle QVAC SDK worker
         run: npx qvac bundle sdk
 
+      - name: Resolve app version (tag → versionName, commit count → versionCode)
+        # The git tag is the single source of truth for releases — no version
+        # bump is committed. app.config.js reads these env vars at prebuild time.
+        run: |
+          if [ "${GITHUB_REF_TYPE}" = "tag" ]; then
+            # Tag "vX.Y.Z" → versionName "X.Y.Z" (strip the leading "v").
+            echo "RESONANCE_VERSION_NAME=${GITHUB_REF_NAME#v}" >> "$GITHUB_ENV"
+          fi
+          # Commit count is strictly increasing across history → a valid,
+          # monotonic Android versionCode without manual bookkeeping.
+          echo "RESONANCE_VERSION_CODE=$(git rev-list --count HEAD)" >> "$GITHUB_ENV"
+
       - name: Expo prebuild (generate android/)
         run: npx expo prebuild --platform android --clean
 

AGENTS.md

@@ -194,17 +194,21 @@ so nothing build-related needs to be committed.
 - **A `v*` tag** builds the APK *and attaches the raw `app-release.apk` to a
   GitHub Release*. This is the only binary users should download.
 
+**The git tag is the single source of truth for the version.** Do **not** bump
+`app.json`/`package.json` per release — `app.config.js` overrides the version at
+build time from env vars CI derives: `versionName` from the tag (`vX.Y.Z` →
+`X.Y.Z`) and `versionCode` from `git rev-list --count HEAD` (strictly increasing,
+so Android always accepts the update). `app.json`'s static version is only the
+local-dev fallback.
+
 **To cut a release (the user-facing APK):**
 
-1. On a `release/vX.Y.Z` branch, bump `version` in **both** `app.json` and
-   `package.json`, and `android.versionCode` in `app.json` (versionCode must
-   strictly increase or Android refuses the update).
-2. Open a PR into `main`, merge it, delete the branch.
-3. `git checkout main && git pull --ff-only`, then tag the merge commit and
-   push the tag: `git tag vX.Y.Z <merge-sha> && git push origin vX.Y.Z`.
-4. CI builds from the tagged commit and attaches `app-release.apk` to the new
+1. `git checkout main && git pull --ff-only`.
+2. Tag the head of `main` and push the tag — that is the whole release:
+   `git tag vX.Y.Z && git push origin vX.Y.Z`. No branch, no PR, no version bump.
+3. CI builds from the tagged commit and attaches `app-release.apk` to the new
    Release. Confirm with `gh release view vX.Y.Z`.
-5. **Write the release notes — a Release with a bare APK and no body is not
+4. **Write the release notes — a Release with a bare APK and no body is not
    done.** Use the standing template (see `v0.1.1`): install steps, the
    **SHA-256 of the attached APK** (`Get-FileHash app-release.apk -Algorithm
    SHA256` on the CI-built artifact), the debug-signing caveat, and a one-line

app.config.js

@@ -0,0 +1,23 @@
+// Resonance Expo config.
+//
+// Static configuration lives in app.json. This thin wrapper lets the release
+// pipeline make the **git tag the single source of truth for the version**:
+// when CI sets the env vars below (versionName from the tag, versionCode from a
+// monotonic commit count), they win; otherwise app.json's values are used, so
+// local development and non-release builds are unaffected.
+//
+// Expo passes the parsed app.json in as `config`, so this only overrides the
+// two version fields and leaves everything else untouched.
+module.exports = ({ config }) => {
+  const versionName = process.env.RESONANCE_VERSION_NAME;
+  const versionCode = process.env.RESONANCE_VERSION_CODE;
+
+  return {
+    ...config,
+    ...(versionName ? { version: versionName } : {}),
+    android: {
+      ...config.android,
+      ...(versionCode ? { versionCode: Number.parseInt(versionCode, 10) } : {}),
+    },
+  };
+};