Skip to content

Commit 129a93d

Browse files
committed
fix(ci): publish :testing on every merge to testing branch
publish.yml was only triggered by builds on main and next. Auto-merge PRs target the testing branch, so their builds completed successfully but no image was ever published. promote-testing-to-main.yml fires on push to testing and immediately does skopeo inspect dakota:testing — this silently failed whenever testing advanced without a prior main publish. Fix: add testing and gh-readonly-queue/testing/** to the workflow_run branches filter, allow testing in the setup job condition, and map the testing branch to testing_tag=testing. The fast-forward-testing step in the promote job is already gated on branch==main so there is no loop. Result: every merge to testing now publishes :testing immediately, matching the bluefin/bluefin-lts behaviour. Assisted-by: Claude Sonnet 4.6 via pi
1 parent 4c0073c commit 129a93d

1 file changed

Lines changed: 13 additions & 4 deletions

File tree

.github/workflows/publish.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ on:
1010
- 'gh-readonly-queue/main/**'
1111
- next
1212
- 'gh-readonly-queue/next/**'
13+
- testing
14+
- 'gh-readonly-queue/testing/**'
1315

1416
env:
1517
IMAGE_NAME: dakota
@@ -44,7 +46,9 @@ jobs:
4446
(github.event.workflow_run.head_branch == 'main' ||
4547
startsWith(github.event.workflow_run.head_branch, 'gh-readonly-queue/main/') ||
4648
github.event.workflow_run.head_branch == 'next' ||
47-
startsWith(github.event.workflow_run.head_branch, 'gh-readonly-queue/next/')))
49+
startsWith(github.event.workflow_run.head_branch, 'gh-readonly-queue/next/') ||
50+
github.event.workflow_run.head_branch == 'testing' ||
51+
startsWith(github.event.workflow_run.head_branch, 'gh-readonly-queue/testing/')))
4852
steps:
4953
- name: Resolve build SHA and trigger event
5054
id: context
@@ -60,12 +64,17 @@ jobs:
6064
fi
6165
echo "branch=${BRANCH}" >> "$GITHUB_OUTPUT"
6266
# Derive the :testing tag from the branch name.
63-
# main → :testing (stable dev stream)
67+
# main → :testing (from main via promote job)
68+
# testing → :testing (direct: every merge to testing publishes immediately)
6469
# next → :next (rolling GNOME master / bleeding edge)
6570
if [[ "$BRANCH" == "main" || "$BRANCH" == gh-readonly-queue/main/* ]]; then
6671
echo "testing_tag=testing" >> "$GITHUB_OUTPUT"
6772
elif [[ "$BRANCH" == "next" || "$BRANCH" == gh-readonly-queue/next/* ]]; then
6873
echo "testing_tag=next" >> "$GITHUB_OUTPUT"
74+
elif [[ "$BRANCH" == "testing" || "$BRANCH" == gh-readonly-queue/testing/* ]]; then
75+
# testing branch builds publish :testing directly so every merge to
76+
# testing produces a fresh image. Matches bluefin/bluefin-lts behaviour.
77+
echo "testing_tag=testing" >> "$GITHUB_OUTPUT"
6978
else
7079
# Fallback for any future branches: strip merge-queue prefix
7180
CLEAN="${BRANCH#gh-readonly-queue/}"
@@ -241,8 +250,8 @@ jobs:
241250
242251
# ── Promote :testing ──────────────────────────────────────────────────────
243252
# Re-tags :$sha as :testing immediately after a successful publish on any
244-
# main or merge-queue build. No e2e gate here — every merged PR ships to
245-
# :testing so users always get the latest code.
253+
# main, testing, or merge-queue build. No e2e gate here — every merged PR
254+
# ships to :testing so users always get the latest code.
246255
# e2e only gates the weekly :testing → :stable promotion.
247256
# NVIDIA is continue-on-error so a failing NVIDIA promote does not
248257
# prevent the default :testing from landing.

0 commit comments

Comments
 (0)