fix(ci): rebase before pushing release manifest changes

also allow specified track in bump-patch to trigger an update if it changed

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>

Author: bmc08gt

.github/workflows/build-fcash2-upload-android.yml

@@ -129,6 +129,7 @@ jobs:
           git add .well-known/release-manifest.json
           git diff --cached --quiet && echo "No changes to commit" && exit 0
           git commit -m "build: update release manifest"
+          git pull --rebase https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git code/cash
           git push https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git HEAD:code/cash
 
       - name: Upload build artifacts

.github/workflows/bump-patch.yml

@@ -47,12 +47,18 @@ jobs:
         run: bash scripts/update-release-manifest.sh
 
       - name: Commit & Push changes
-        if: steps.manifest.outputs.prod_changed == 'true' || steps.manifest.outputs.forced == 'true'
-        uses: actions-js/push@master
-        with:
-          message: >-
-            ${{ steps.manifest.outputs.prod_changed == 'true'
-              && format('build: release Flipcash {0} ({1}), bump to {2}', steps.manifest.outputs.new_prod_name, steps.manifest.outputs.new_prod, steps.manifest.outputs.version)
-              || format('build: bump Flipcash to {0}', steps.manifest.outputs.version) }}
-          branch: "code/cash"
-          github_token: ${{ secrets.BOT_GITHUB_TOKEN }}
+        if: steps.manifest.outputs.manifest_changed == 'true' || steps.manifest.outputs.prod_changed == 'true' || steps.manifest.outputs.forced == 'true'
+        env:
+          GITHUB_TOKEN: ${{ secrets.BOT_GITHUB_TOKEN }}
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add -A
+          COMMIT_MSG="${{ steps.manifest.outputs.prod_changed == 'true'
+            && format('build: release Flipcash {0} ({1}), bump to {2}', steps.manifest.outputs.new_prod_name, steps.manifest.outputs.new_prod, steps.manifest.outputs.version)
+            || (steps.manifest.outputs.forced == 'true'
+              && format('build: bump Flipcash to {0}', steps.manifest.outputs.version)
+              || 'build: update release manifest') }}"
+          git commit -m "$COMMIT_MSG"
+          git pull --rebase https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git code/cash
+          git push https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git HEAD:code/cash

scripts/update-release-manifest.sh

@@ -142,6 +142,13 @@ emit "old_prod" "${OLD_PROD:-null}"
 emit "new_prod" "${NEW_PROD:-null}"
 emit "new_prod_name" "${NEW_PROD_NAME:-null}"
 
+# --- detect whether any track changed ---
+if diff -q <(jq -S .tracks "$MANIFEST_PATH") <(echo "$EXISTING" | jq -S '.tracks // {}') >/dev/null 2>&1; then
+  emit "manifest_changed" "false"
+else
+  emit "manifest_changed" "true"
+fi
+
 # --- decide whether to bump patch ---
 PROD_CHANGED=false
 if in_list "production" "$TRACKS" && [ "${OLD_PROD:-null}" != "${NEW_PROD:-null}" ]; then