[Peeja]

Written by Claude.

Closes FIL-1381

Problem

Dev gets a bump PR for every image a service publishes, and the bot merges it itself. Promoting to staging means editing nodes/staging/eu-central-3/apps/versions.env by hand, and working out from each pin's source commit what the promotion brings. #86, #107 and #116 were all written that way.

Change

• .github/workflows/promote-staging.yml runs scripts/ci/promote-staging.sh on every push to main, and on workflow_dispatch. It uses the fil-forge-bot token, as the bump workflows do, so the PR's checks run.
• scripts/ci/promote-staging.sh keeps one PR, "Promote dev's images to staging", on bot/promote-staging:
  • Staging behind dev: it rebuilds the branch as main plus staging's pins set to dev's, then opens or refreshes the PR. If the branch is already exactly that, it doesn't push, so the checks don't rerun.
  • The body lists, for each service that moves, the commits between staging's pin and dev's. Each digest's source commit comes from the dev bump that first carried it (its - Commit: line), and the compare API supplies the list in between. (#123) in titles is rewritten to (fil-forge/piri#123), so it doesn't link to this repository's PRs. If a source commit is unknown, or the API won't give a list, the body says so rather than failing.
  • Staging matches dev: it closes the PR and deletes the branch.
  • Auto-merge: it never turns auto-merge on. It turns off any a person turned on for an earlier head, since a new head is a new set of images.
  • Hand pushes: a branch someone pushed to by hand, to hold a service back say, is left alone while its PR is open.
  • --dry-run builds the branch locally and prints the message, without pushing, opening or closing anything.
• scripts/ci/set-node-pin.sh takes --node, defaulting to dev, so the promotion writes pins through the same script as the bumps. The node name must match ^[a-z0-9-]+(/[a-z0-9-]+)?$, and nodes/<node>/apps/versions.env must exist.
• docs/RUNBOOK.md: the deploy entry now says how to promote, how to hold a service back, and what --node does.

Nothing about dev's bumps changes. refresh-bump-prs.sh only matches bot/bump-*-image-dev, so it never touches bot/promote-staging.

Testing

• set-node-pin.sh: it pins staging with --node staging/eu-central-3, and dev by default. It rejects --node ../x, a node with no versions.env, and a missing argument. --help prints the whole header.

• promote-staging.sh: I ran it against a local bare repository standing in for origin, with gh api stubbed by unauthenticated curl and gh pr faked and logged.

  • The change lists: with main at 02ab02a, just before Promote Piri and Ingot to staging #116, the dry run's change lists are the ones I wrote by hand for Promote Piri and Ingot to staging #116, oldest first.
  • Every path:

  Situation	Result
  Staging behind dev, nothing open	pushes the branch, opens the PR
  Rerun, nothing changed	no push; the body is refreshed
  main moved, auto-merge on	rebuilt on the new main, auto-merge turned off
  A person pushed to the branch, PR open	left alone
  The same, after the PR merged	rebuilt and reopened
  Staging matches dev, PR open	branch deleted, PR commented on and closed
  Staging matches dev, nothing open	nothing
  Real main (1867d62, after Promote Piri and Ingot to staging #116)	"staging already pins what dev pins"

• Not run here: shellcheck and actionlint, which aren't installed; CI's shell check runs shellcheck. The workflow parses as YAML. make check-compose passes.

Notes

• Assumption: the bot may push bot/promote-staging, as it pushes bot/bump-*. If the ruleset limits the bot to bot/bump-*, the first run will fail at the push.
• Approval: the bot is the PR's author, so a person should be able to approve and merge it. I haven't seen the ruleset, so I can't confirm that.
• After merge: dev has taken new Piri and Ingot images since Promote Piri and Ingot to staging #116 (Bump ingot on dev to sha256:2098c75 #126, Bump piri on dev to sha256:38c77bc #127) and staging hasn't, so the first run should open a promotion PR carrying both.

🤖 Generated with Claude Code

https://claude.ai/code/session_01JCF8gyb8jNRmHmWqQmVhRJ

✴️

[Peeja]

I'm merging this and keeping an eye on the result. We should see a staging deploy PR appear and then be kept up to date.

[bajtos]

Love it!

The list of changes looks a bit weird when formatted on GitHub - the PR title is shown twice, the commit hash is not a link.

See here: #129