ci: stop rewriting flasher config.json; sync release notes to the release body
The flasher's versions become feed-driven (/releases on the firmware proxy Worker): config.json's observer entries turn into github release defs with no embedded filenames, so update-firmware.py would find zero matches and exit nonzero — remove the call before the config conversion lands. Changelog notes now ride the release body via a non-fatal 'gh release edit --notes-file firmware-notes.html' in the publish step. MUST land before the flasher config.json conversion, or the next build goes red at Update Flasher Config. Workflow-only commit: pushing this triggers no build.
This commit is contained in:
1 parent
80b4e4051c
commit
26db31f625
1 file changed
+14
-8
@@ -189,6 +189,13 @@ jobs:
|
|||||||
# not published as release assets (and they'd break the hash-based prune).
|
# not published as release assets (and they'd break the hash-based prune).
|
||||||
gh release upload "$RELEASE_TAG" $(find out -maxdepth 1 -type f ! -name '*.partsig') --clobber
|
gh release upload "$RELEASE_TAG" $(find out -maxdepth 1 -type f ! -name '*.partsig') --clobber
|
||||||
|
|
||||||
|
# Keep the release body in sync with the repo's notes source: the
|
||||||
|
# /releases feed serves it as the flasher dropdown's changelog
|
||||||
|
# (config.json no longer carries per-version notes). Non-fatal —
|
||||||
|
# stale notes beat a red build whose binaries are already live.
|
||||||
|
gh release edit "$RELEASE_TAG" --notes-file firmware-notes.html \
|
||||||
|
|| echo "WARNING: release notes sync failed" >&2
|
||||||
|
|
||||||
# Prune old assets, but RETAIN the most recent KEEP_BUILDS build hashes
|
# Prune old assets, but RETAIN the most recent KEEP_BUILDS build hashes
|
||||||
# (not just the current one). The flasher SPA reads config.json once at
|
# (not just the current one). The flasher SPA reads config.json once at
|
||||||
# page load and the embedded git short-hash is what links it to assets;
|
# page load and the embedded git short-hash is what links it to assets;
|
||||||
@@ -226,11 +233,10 @@ jobs:
|
|||||||
token: ${{ secrets.FLASHER_DISPATCH_TOKEN }}
|
token: ${{ secrets.FLASHER_DISPATCH_TOKEN }}
|
||||||
path: flasher
|
path: flasher
|
||||||
|
|
||||||
- name: Update Flasher Config
|
# update-firmware.py is no longer called here: config.json's observer
|
||||||
run: |
|
# entries are github release defs (no embedded filenames to rewrite), the
|
||||||
python3 flasher/scripts/update-firmware.py \
|
# flasher's versions come from the Worker's /releases feed, and the
|
||||||
"${{ steps.sha.outputs.short }}" \
|
# changelog notes ride the release body (see the publish step).
|
||||||
"$GITHUB_WORKSPACE/firmware-notes.html"
|
|
||||||
|
|
||||||
- name: Generate Slim Per-Variant Manifests + Persist Build Counter
|
- name: Generate Slim Per-Variant Manifests + Persist Build Counter
|
||||||
env:
|
env:
|
||||||
@@ -289,9 +295,9 @@ jobs:
|
|||||||
- name: Commit & Push Flasher Config
|
- name: Commit & Push Flasher Config
|
||||||
working-directory: flasher
|
working-directory: flasher
|
||||||
run: |
|
run: |
|
||||||
# Stage everything: update-firmware.py edits config.json in place, but the
|
# Stage everything: the slim manifests (v/*.json) and the build counter
|
||||||
# slim manifests (v/*.json) and the build counter can be NEW files, which
|
# can be NEW files, which `commit -am` would miss — so add -A and check
|
||||||
# `commit -am` would miss — so add -A and check the staged diff.
|
# the staged diff. (config.json is no longer rewritten per build.)
|
||||||
git add -A
|
git add -A
|
||||||
if git diff --cached --quiet; then
|
if git diff --cached --quiet; then
|
||||||
echo "No flasher changes to commit."
|
echo "No flasher changes to commit."
|
||||||
|
|||||||
Reference in new issue
Block a user