Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 74 additions & 62 deletions .github/release-lines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,21 @@
# CUTTING A NEW RELEASE LINE: add the branch name to `release_lines` below AND
# to every workflow listed under `pinned` AND to every list under `env_lists`.
# The guard fails until all three are done — that is the whole point, so do not
# "fix" it by only editing one side.
# "fix" it by only editing one side. `release_lines` is ALSO the run-time
# allow-list tagged-release.yml and promote-stable.yml check before serving
# the branch they were started from (#9154): adding a line here is what lets it
# mint vN.x.y tags and promote `stable`. The rest of the cut (docker.yml
# channel rows, default branch, docs) is the checklist in
# src/docs/release-line-guard.md.

# The release lines CI is expected to cover.
release_lines: [v4, v5]
# The release lines CI is expected to cover. v6 was cut as a release line on
# 2026-11-07: it mints `v6.x.y` tags, GitHub Releases and SBOMs through
# tagged-release.yml like v5 does. Channel ownership did NOT move with it —
# v5 still publishes `candidate` + `:latest` and owns `stable` (promoted from
# the default branch by promote-stable.yml); v6 publishes `edge` + `v6-latest`
# (its own docker.yml rows). See src/docs/release-line-guard.md, "Cutting a
# new release line", and src/docs/releases.md.
release_lines: [v4, v5, v6]

# Workflows whose branch filters are pinned to the release lines.
#
Expand All @@ -47,45 +58,45 @@ pinned:
# sunset, and a PR targeting v2 runs the v2 merge-ref's workflows anyway,
# where this file does not exist. Same excluded-not-backfilled reasoning as
# docs-link-check.yml below.
# v6 is carried as an EXTRA on the workflows below rather than added to
# `release_lines`: it is a development line for the #7563 epic, not a
# supported release line with a GA bar. What it DOES need is the same PR
# gating as v4, because feature PRs target it directly (spine, mention
# triggers); without these extras a v6-base PR runs no Go build, test, or
# security lane at all. It is ALSO published — `v6-latest` and, once its own
# docker.yml rows say so, the `edge` channel (#7721 Phase 1) — which is the
# `env_lists` extra below, not a `release_lines` entry: publishing a line's
# image is a narrower commitment than covering it with every pinned lane.
changelog-fragment-guard.yml: [v5, v6]
# v6 used to be carried as an EXTRA on the PR-gating workflows below while
# it was the #7563 development line; since its cut (2026-11-07) it is a
# `release_lines` entry, so the extras are gone and every pinned lane that
# does not write down a `-v6` exclusion covers it.
changelog-fragment-guard.yml: []
# Static analysis and vulnerability scanning for the Go module. Pinned to the
# release lines and nothing else: a feature branch gets the same gate through
# `pull_request`, and running it on every pushed branch would burn runner
# minutes re-scanning code that has not reached a release line.
# Added with the docs link checker (#5278), after the v2 line was sunset
# (#5030-era). It gates src/docs/ links on v4 only; v2 is excluded rather
# than back-filled, because the workflow never ran there and adding it
# would gate a line no longer taking doc changes.
# (#5030-era). It gates src/docs/ links on every release line (#9476): v6
# takes doc changes through feature PRs like the other lines, and without
# it a v6-base PR's broken doc links and stale code citations landed
# ungated. v2 was never back-filled: the workflow never ran there and the
# line is retired.
docs-link-check.yml: []
# Post-merge DCO monitor for protected branch history. It intentionally
# watches v4 and v5 only: v4 is the source line whose Tide squash commits
# triggered #6312, and v5 is the sync target that inherits those commits.
dco-post-merge.yml: [v5]
# Push-scoped delta DCO gate (#6756). Same v4/v5 coverage and reasoning as
# dco-post-merge.yml above: v4 is the line whose pushes it audits, v5 the
# sync target inheriting them; v2 is sunset and takes no pushes.
dco-push-delta.yml: [v5]
# FOSSA license scanning runs on the active CNCF onboarding line only;
# v4 is feature-frozen and not being imported as the initial Hive Commons
# CNCF FOSSA project.
fossa.yml: [-v4]
# GitHub Actions Workflow triage compiles only on the active v5 line; older
# release lines do not carry the gh-aw automation surface.
gh-aw-compile.yml: [-v4]
# Post-merge DCO monitor for protected branch history. It watches every
# release line: v4 is the source line whose Tide squash commits triggered
# #6312, and v5 and v6 are the sync targets that inherit those commits.
dco-post-merge.yml: []
# Push-scoped delta DCO gate (#6756). Same coverage and reasoning as
# dco-post-merge.yml above: v4 is the line whose pushes it audits, v5 and
# v6 the sync targets inheriting them; v2 is sunset and takes no pushes.
dco-push-delta.yml: []
# FOSSA license scanning runs on the CNCF onboarding line only: the Hive
# Commons FOSSA project is imported from ONE branch, v5. v4 is
# feature-frozen; v6 inherits v5's dependency set through the top-ups and
# is not a second FOSSA project.
fossa.yml: [-v4, -v6]
# GitHub Actions Workflow triage compiles only on the default v5 line, where
# the gh-aw agentic workflows are registered; v4 does not carry the gh-aw
# automation surface and v6 only mirrors v5's compiled lock files.
gh-aw-compile.yml: [-v4, -v6]
# Self-test for the hive-action-smoke dispatch workflow (#12964). Its push
# trigger names v5 only: the smoke workflow is registered on v5 and does not
# exist on the feature-frozen v4 line, so there is nothing there to test.
hive-action-smoke-tests.yml: [-v4]
go-security-analysis.yml: [v5, v6]
# v6 carries its own action unit gate (hive-action-tests.yml, v6 only).
hive-action-smoke-tests.yml: [-v4, -v6]
go-security-analysis.yml: []
podman-arm64-lane.yml: []
podman-contract.yml: []
podman-rootful-lane.yml: []
Expand Down Expand Up @@ -118,46 +129,48 @@ pinned:
# They react to PRs into, and pushes to, the lines that take feature PRs:
# v5 (stable + candidate) and v6 (edge). v4 is feature-frozen and takes no
# new PRs, so there is nothing there to order or refresh.
pr-overlap.yml: [v6, -v4]
pr-auto-update.yml: [v6, -v4]
pr-auto-update-test.yml: [v6, -v4]
pr-overlap.yml: [-v4]
pr-auto-update.yml: [-v4]
pr-auto-update-test.yml: [-v4]
# Native queue admission is available on the active feature lines only.
# This is CI coverage, not an opt-in or a queue rule for either branch.
native-queue-policy.yml: [v6, -v4]
testutil-guard.yml: [v5, v6]
v2-ci.yml: [v5, v6]
v2-tests.yml: [v5, v6]
native-queue-policy.yml: [-v4]
testutil-guard.yml: []
v2-ci.yml: []
v2-tests.yml: []
# Automated v4 -> v5 forward-merge cadence (#7297). Its only branch filter is
# the `workflow_run` trigger, which names the line whose RELEASES it reacts
# to — v4, the source of every top-up. v2 is sunset and cuts no releases to
# carry forward, and v5 is the merge TARGET rather than a trigger, so it is
# not a branch this workflow watches (on v5, where v5 is itself a release
# line, it must be excluded explicitly for the same reason).
v5-topup.yml: [-v5]
# not a branch this workflow watches (v5 and v6 are release lines too, so
# they must be excluded explicitly for the same reason — v6 reaches v4's
# releases through v5).
v5-topup.yml: [-v5, -v6]
# Post-freeze intake gate for v4 (#7693, runbook §2). It watches PRs into
# the ONE line the accepted freeze policy (#6346) applies to; v2 is sunset
# and takes no PRs, and v5/v6 are exactly where non-critical work is sent.
v4-freeze-gate.yml: [-v5]
v4-freeze-gate.yml: [-v5, -v6]
# Automated v5 -> v6 forward-merge cadence (#7563, Track 7). Its only branch
# filter is the `push` trigger naming the line whose MOVEMENT it reacts to —
# v5, the source of every v6 top-up. v2 and v4 are excluded for the same
# reason as v5-topup.yml's exclusions: they are not the branch this workflow
# watches (v4 reaches v6 through v5), and v6 is the merge TARGET, not a
# trigger.
v6-topup.yml: [v5, -v4]
# v5, the source of every v6 top-up. v4 is excluded for the same reason as
# v5-topup.yml's exclusions: it is not the branch this workflow watches (v4
# reaches v6 through v5), and v6 is the merge TARGET, not a trigger.
v6-topup.yml: [-v4, -v6]
# Publishes src/crux to hivecommons/crux (#14138). It watches the ONE line
# the published module is cut from — v5, where the nested module lives and
# where `crux/vX.Y.Z` tags are made. v4 is feature-frozen and has no
# src/crux; publishing from two lines would race on hivecommons/crux main.
crux-sync.yml: [-v4]
# src/crux; v6 carries a copy through the top-ups but publishing from two
# lines would race on hivecommons/crux main.
crux-sync.yml: [-v4, -v6]
# Nightly + path-filtered Forgejo smoke (#14116). Its push/pull_request
# filters name v5 only: the forge.Merger it exercises lives on v5, and v4 is
# feature-frozen.
forgejo-smoke.yml: [-v4]
# filters name v5 only: it exercises the forge.Merger against a live Forgejo
# and one line's coverage is enough for a shared package — v6 inherits the
# package through the top-ups, and v4 is feature-frozen.
forgejo-smoke.yml: [-v4, -v6]
# Publishes the headless Twitch streamer image (#15594) from v5 only: the
# dashboard's `?kiosk=1` mode it depends on lives on v5 and v4 is
# feature-frozen. The image is operator tooling, not a hive release channel.
stream-image.yml: [-v4]
# image is operator tooling, not a hive release channel, so it follows the
# default branch rather than every release line; v4 is feature-frozen.
stream-image.yml: [-v4, -v6]

# Workflows that deliberately do NOT pin to the release lines. Each must keep a
# wildcard branch filter; if one is ever narrowed to a fixed list, the guard
Expand Down Expand Up @@ -185,11 +198,10 @@ env_lists:
# docker.yml's gate job: only long-lived branches push to GHCR. `mk` and `dd`
# are standing experimental branches — not release lines, but branches a hive
# can be assigned to, so they legitimately publish a `<branch>-latest` tag.
# `v6` is the #7563 development line, published so the `edge` channel can be
# re-based on it (#7721 Phase 1): `v6-latest` must exist before v6's own
# docker.yml publish rows can point `edge` at it. Every release branch that
# carries this list names v6 here, so the guard agrees across lines.
docker.yml LONG_LIVED: [mk, dd, v6]
# `v6` used to be an extra here while it was the #7563 development line
# (published so the `edge` channel could be re-based on it, #7721 Phase 1);
# since its cut it is a release line and covered without an extra.
docker.yml LONG_LIVED: [mk, dd]

# MAINTAINER DECISION (#4405, answered by #8061 on 2026-09-21): `v2` is retired.
# It was removed from `release_lines`, from every workflow that named it, and
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/integration-governance.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const MAX_COMMITS = 1000;
const MAX_AUTHOR_BATCH = 50;
// This literal is inside the enrolled .github closure. A caller-supplied
// preparedBy.sourceSHA must never choose a new executable verifier tree.
const TRUSTED_SCRIPTS_TREE = '6cf759e22116d5ec9df85267c89c028e2386ee9f';
const TRUSTED_SCRIPTS_TREE = 'c06705a4339105f9cdc51220053c319a2b90dce1';
const SOURCE = 'https://github.com/kubernetes-sigs/kubebuilder-release-tools/tree/012269a88fa4c034a0acf1ba84c26b195c0dbab4';
const sha = value => crypto.createHash('sha256').update(value).digest('hex');
const git = (args, cwd = process.cwd()) =>
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/dco-post-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
branches:
- v4
- v5
- v6
# The checker itself is in scope, not just the history it checks. Until this
# filter was added, src/scripts/test-check-dco-trailers.sh existed but no
# workflow ever ran it — a change to the checker (or to the waiver logic that
Expand Down Expand Up @@ -368,7 +369,7 @@ jobs:
strategy:
fail-fast: false
matrix:
branch: [v4, v5]
branch: [v4, v5, v6]
steps:
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
if: github.event_name != 'push' || github.ref == format('refs/heads/{0}', matrix.branch)
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dco-push-delta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ on:
branches:
- v4
- v5
- v6

permissions:
contents: read
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/docs-link-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ on:
branches:
- v4
- v5
- v6
paths:
- '*.md'
- 'src/docs/**'
Expand All @@ -62,6 +63,7 @@ on:
branches:
- v4
- v5
- v6
paths:
- '*.md'
- 'src/docs/**'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/podman-arm64-lane.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ on:
branches:
- v4
- v5
- v6
pull_request:
paths:
- '.github/workflows/podman-arm64-lane.yml'
Expand All @@ -100,6 +101,7 @@ on:
branches:
- v4
- v5
- v6
workflow_dispatch:
inputs:
image:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/podman-contract.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ on:
branches:
- v4
- v5
- v6
paths:
- 'Justfile'
- 'src/scripts/check-podman-contract.sh'
Expand All @@ -32,6 +33,7 @@ on:
branches:
- v4
- v5
- v6
paths:
- 'Justfile'
- 'src/scripts/check-podman-contract.sh'
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/podman-rootful-lane.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ on:
branches:
- v4
- v5
- v6
pull_request:
paths:
- '.github/workflows/podman-rootful-lane.yml'
Expand All @@ -78,6 +79,7 @@ on:
branches:
- v4
- v5
- v6
workflow_dispatch:
inputs:
somark:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/podman-rootless-lane.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ on:
branches:
- v4
- v5
- v6
pull_request:
paths:
- '.github/workflows/podman-rootless-lane.yml'
Expand All @@ -59,6 +60,7 @@ on:
branches:
- v4
- v5
- v6
workflow_dispatch:
inputs:
bypass:
Expand Down
21 changes: 17 additions & 4 deletions .github/workflows/promote-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,19 @@ permissions:
issues: write
packages: write

# RELEASE LINE (#9154): `stable` is promoted from the candidate published by
# the branch this run was started from — the default branch for `schedule`,
# the chosen ref for `workflow_dispatch` — never a literal. The first step
# refuses unless that branch is under `release_lines` in
# .github/release-lines.yml, so a dispatch from a development line can no
# longer promote another line's candidate, and cutting a new line needs no
# edit here. Checklist: src/docs/release-line-guard.md.
concurrency:
group: stable-promotion-v5
group: stable-promotion-${{ github.ref_name }}
cancel-in-progress: false

env:
RELEASE_BRANCH: v5
RELEASE_BRANCH: ${{ github.ref_name }}
SOAK_HOURS: ${{ inputs.soak-hours || '24' }}
DRY_RUN: ${{ inputs.dry-run || 'false' }}
IMAGE_NAMES: hive hive-contributor hive-hub
Expand Down Expand Up @@ -118,8 +125,14 @@ jobs:
steps:
- name: Checkout promotion scripts
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
with:
ref: v5

- name: Require the triggering branch to be a declared release line
run: |
set -euo pipefail
if ! src/scripts/check-release-lines.sh --is-release-line "$RELEASE_BRANCH"; then
echo "::error::Promote Stable was started from '${RELEASE_BRANCH}', which is not under release_lines in .github/release-lines.yml, so it has no candidate to promote. Dispatch it from a release line, or cut this branch as one first (src/docs/release-line-guard.md)." >&2
exit 1
fi

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@f87e5991a6d7451dcb8d9637bfbc97413f497069 # v4.4.1
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/quadlet-gate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ on:
branches:
- v4
- v5
- v6
pull_request:
paths:
- '.github/workflows/quadlet-gate.yml'
Expand All @@ -70,6 +71,7 @@ on:
branches:
- v4
- v5
- v6
workflow_dispatch:

permissions:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
schedule:
- cron: '0 6 * * 1'
push:
branches: [ "main", "v4", "v5" ]
branches: [ "main", "v4", "v5", "v6" ]
workflow_dispatch:

permissions:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/suid-contract.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ on:
branches:
- v4
- v5
- v6
paths:
- 'src/Dockerfile'
- 'src/deploy/entrypoint.sh'
Expand All @@ -39,6 +40,7 @@ on:
branches:
- v4
- v5
- v6
paths:
- 'src/Dockerfile'
- 'src/deploy/entrypoint.sh'
Expand Down
Loading
Loading