From d323c5ca169838b62dd61046d55911a9b603886c Mon Sep 17 00:00:00 2001 From: Jeffrey Sica Date: Tue, 29 Sep 2026 00:15:08 -0500 Subject: [PATCH 1/6] build: take runtime.yml and collect_initial_scripts from the FSDK junction project.conf reached FSDK's include/runtime.yml through gnome-build-meta's freedesktop-sdk.bst, which gnome-build-meta.bst overrides with ours, so the include was already our FSDK's file. freedesktop-sdk ships collect_initial_scripts itself (plugins/elements/, MIT); load it from that junction instead. Every element keeps its cache key, and a forced rebuild of os-initial-scripts.bst with the FSDK plugin followed by oci/bluefin-server-usr.bst gave byte-identical initial scripts, usr.raw and usr-verity.raw (usrhash 91ba8a79...). Assisted-by: Claude Opus 5.5 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- project.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project.conf b/project.conf index 82f7015b..e86b2681 100644 --- a/project.conf +++ b/project.conf @@ -7,7 +7,7 @@ min-version: 2.5 element-path: elements (@): - - gnome-build-meta.bst:freedesktop-sdk.bst:include/runtime.yml + - freedesktop-sdk.bst:include/runtime.yml - include/aliases.yml options: @@ -65,7 +65,7 @@ plugins: - patch_queue - cargo2 - origin: junction - junction: gnome-build-meta.bst + junction: freedesktop-sdk.bst elements: - collect_initial_scripts From c7b0c7f13a0df7d187c6ce0fc5d083d74c74524d Mon Sep 17 00:00:00 2001 From: Jeffrey Sica Date: Tue, 29 Sep 2026 00:15:08 -0500 Subject: [PATCH 2/6] ci: stop tracking the gnome-build-meta junction Nothing in the graph loads from gnome-build-meta any more. Drop its Renovate rule, its entry in check-renovate-series.py and the pre-commit file filter, and track only freedesktop-sdk.bst in track-junctions.yml. Assisted-by: Claude Opus 5.5 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/scripts/check-renovate-series.py | 5 +---- .github/workflows/track-junctions.yml | 25 ++++++------------------ .pre-commit-config.yaml | 2 +- renovate.json | 6 ------ tests/unit/test_check_renovate_series.py | 20 +++++++------------ 5 files changed, 15 insertions(+), 43 deletions(-) diff --git a/.github/scripts/check-renovate-series.py b/.github/scripts/check-renovate-series.py index 016f5014..649d99a7 100755 --- a/.github/scripts/check-renovate-series.py +++ b/.github/scripts/check-renovate-series.py @@ -36,9 +36,6 @@ "https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git": ( ROOT / "elements" / "freedesktop-sdk.bst" ), - "https://gitlab.gnome.org/GNOME/gnome-build-meta.git": ( - ROOT / "elements" / "gnome-build-meta.bst" - ), } TRACK_RE = re.compile(r"^\s*track:\s*[\"']?([^\"'\s]+)[\"']?\s*$", re.MULTILINE) @@ -54,7 +51,7 @@ def series_of(track): """The literal prefix of a track glob, with the trailing '*' removed. `freedesktop-sdk-26.08*` -> `freedesktop-sdk-26.08` - `gnome-50` -> `gnome-50` (no glob; the whole value) + `stable` -> `stable` (no glob; the whole value) """ return track.split("*", 1)[0] diff --git a/.github/workflows/track-junctions.yml b/.github/workflows/track-junctions.yml index 09f1fae0..8f13ed46 100644 --- a/.github/workflows/track-junctions.yml +++ b/.github/workflows/track-junctions.yml @@ -6,8 +6,8 @@ name: Track junction refs # This deliberately has NO `pull_request` trigger. The job this replaces # (`track-refs` in build.yml) ran on every `renovate/*` pull request and pushed # re-resolved junction refs onto that PR's branch, so unrelated dependency PRs -# silently acquired freedesktop-sdk and gnome-build-meta bumps that appeared in -# no title, body or Renovate table. Moving the work onto a schedule with its own +# silently acquired freedesktop-sdk bumps that appeared in no title, body or +# Renovate table. Moving the work onto a schedule with its own # branch also removes the need for the old `startsWith(github.head_ref, # 'renovate/')` gate: a branch name is not an identity, and on a scheduled # trigger there is no PR-controlled head to gate in the first place. @@ -57,18 +57,13 @@ jobs: with: tool: just@1.58.0 - - name: Track and resolve BuildStream junction refs + - name: Track and resolve the BuildStream junction ref run: | set -euo pipefail - # No `|| true` here. The job this replaces swallowed both exit codes, + # No `|| true` here. The job this replaces swallowed the exit code, # which made an upstream outage indistinguishable from "nothing to # track" and let the run report success having resolved nothing. - # - # gnome-build-meta.bst carries `overrides: freedesktop-sdk.bst`, so - # the pair is only valid together and is tracked and committed as one - # atomic change — same rationale as dakota's track-core-junctions. just bst source track freedesktop-sdk.bst - just bst source track gnome-build-meta.bst - name: Sync release-version to the tracked FSDK point release run: | @@ -98,12 +93,10 @@ jobs: git config user.email "41898282+github-actions[bot]@users.noreply.github.com" old_fsdk=$(git show "HEAD:elements/freedesktop-sdk.bst" | awk '/^[[:space:]]*ref:/ { print $2; exit }') - old_gbm=$(git show "HEAD:elements/gnome-build-meta.bst" | awk '/^[[:space:]]*ref:/ { print $2; exit }') new_fsdk=$(awk '/^[[:space:]]*ref:/ { print $2; exit }' elements/freedesktop-sdk.bst) - new_gbm=$(awk '/^[[:space:]]*ref:/ { print $2; exit }' elements/gnome-build-meta.bst) git checkout -B "$BRANCH" - git add elements/freedesktop-sdk.bst elements/gnome-build-meta.bst project.conf + git add elements/freedesktop-sdk.bst project.conf if git diff --cached --quiet; then echo "Junction refs already current — nothing to propose." exit 0 @@ -112,27 +105,21 @@ jobs: title="chore(deps): update BuildStream junctions" if [ "$old_fsdk" != "$new_fsdk" ]; then title="${title} (freedesktop-sdk $(echo "$old_fsdk" | sed 's/^freedesktop-sdk-//;s/-[0-9]*-g[0-9a-f]*$//') -> $(echo "$new_fsdk" | sed 's/^freedesktop-sdk-//;s/-[0-9]*-g[0-9a-f]*$//'))" - elif [ "$old_gbm" != "$new_gbm" ]; then - title="${title} (gnome-build-meta)" fi { - echo "Scheduled resolution of the BuildStream junction refs to their" + echo "Scheduled resolution of the BuildStream junction ref to its" echo "\`git-describe\` form. Opened by the tracker so the bump arrives as its own" echo "reviewable change instead of being pushed into an unrelated pull request." echo "" echo "| Junction | From | To |" echo "| --- | --- | --- |" echo "| \`elements/freedesktop-sdk.bst\` | \`${old_fsdk}\` | \`${new_fsdk}\` |" - echo "| \`elements/gnome-build-meta.bst\` | \`${old_gbm}\` | \`${new_gbm}\` |" echo "" echo "\`project.conf\`'s \`release-version\` is synced to the pinned FSDK point" echo "release in the same commit, because \`check-release-version.py\` fails closed" echo "on drift between the two." echo "" - echo "The two junctions move together: \`gnome-build-meta.bst\` overrides" - echo "\`freedesktop-sdk.bst\`, so a half-applied pair is not a valid graph." - echo "" echo "---" echo "*Generated by [Track junction refs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})*" } > /tmp/pr-body.md diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b211ab5c..297b00ae 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,7 @@ repos: entry: python .github/scripts/check-renovate-series.py language: system pass_filenames: false - files: ^(renovate\.json|elements/(freedesktop-sdk|gnome-build-meta)\.bst|\.github/scripts/check-renovate-series\.py)$ + files: ^(renovate\.json|elements/freedesktop-sdk\.bst|\.github/scripts/check-renovate-series\.py)$ - id: check-k0s-version name: k0s version derived from include/k0s.yml, not restated entry: python .github/scripts/check-k0s-version.py diff --git a/renovate.json b/renovate.json index 1e1e09fd..0c3d8cc5 100644 --- a/renovate.json +++ b/renovate.json @@ -24,12 +24,6 @@ "matchPackageNames": ["https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git"], "extractVersion": "^freedesktop-sdk-(?26\\.08\\.[0-9]+)$", "versioning": "semver" - }, - { - "matchDatasources": ["git-refs"], - "matchPackageNames": ["https://gitlab.gnome.org/GNOME/gnome-build-meta.git"], - "extractVersion": "^(?50\\.[0-9]+)$", - "versioning": "semver" } ] } diff --git a/tests/unit/test_check_renovate_series.py b/tests/unit/test_check_renovate_series.py index afda45e9..76cc16f3 100644 --- a/tests/unit/test_check_renovate_series.py +++ b/tests/unit/test_check_renovate_series.py @@ -37,7 +37,6 @@ def run_against(tmp_path, renovate, junctions): FSDK = "https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git" -GBM = "https://gitlab.gnome.org/GNOME/gnome-build-meta.git" def rule(dep, extract): @@ -53,9 +52,8 @@ def junction(track): return f"kind: junction\n\nsources:\n- kind: git_repo\n track: {track}\n ref: x\n" -BOTH_JUNCTIONS = { +JUNCTIONS = { "freedesktop-sdk.bst": junction("freedesktop-sdk-26.08*"), - "gnome-build-meta.bst": junction("gnome-50"), } @@ -65,13 +63,12 @@ def test_passes_when_series_agree(tmp_path): { "packageRules": [ rule(FSDK, r"^freedesktop-sdk-(?26\.08\.[0-9]+)$"), - rule(GBM, r"^(?50\.[0-9]+)$"), ] }, - BOTH_JUNCTIONS, + JUNCTIONS, ) assert result.returncode == 0, result.stderr - assert "OK: 2" in result.stdout + assert "OK: 1" in result.stdout def test_fails_on_the_real_regression(tmp_path): @@ -81,10 +78,9 @@ def test_fails_on_the_real_regression(tmp_path): { "packageRules": [ rule(FSDK, r"^freedesktop-sdk-(?25\.08\.[0-9]+)$"), - rule(GBM, r"^(?50\.[0-9]+)$"), ] }, - BOTH_JUNCTIONS, + JUNCTIONS, ) assert result.returncode == 1 assert "matches no tag" in result.stderr @@ -94,8 +90,8 @@ def test_fails_on_the_real_regression(tmp_path): def test_fails_when_a_junction_has_no_rule(tmp_path): result = run_against( tmp_path, - {"packageRules": [rule(GBM, r"^(?50\.[0-9]+)$")]}, - BOTH_JUNCTIONS, + {"packageRules": []}, + JUNCTIONS, ) assert result.returncode == 1 assert "no packageRule" in result.stderr @@ -107,12 +103,10 @@ def test_fails_when_the_junction_declares_no_track(tmp_path): { "packageRules": [ rule(FSDK, r"^freedesktop-sdk-(?26\.08\.[0-9]+)$"), - rule(GBM, r"^(?50\.[0-9]+)$"), ] }, { "freedesktop-sdk.bst": "kind: junction\n\nsources:\n- kind: git_repo\n ref: x\n", - "gnome-build-meta.bst": junction("gnome-50"), }, ) assert result.returncode == 1 @@ -121,7 +115,7 @@ def test_fails_when_the_junction_declares_no_track(tmp_path): def test_series_helpers_ignore_the_renovate_placeholder(): assert check_renovate_series.series_of("freedesktop-sdk-26.08*") == "freedesktop-sdk-26.08" - assert check_renovate_series.series_of("gnome-50") == "gnome-50" + assert check_renovate_series.series_of("stable") == "stable" assert check_renovate_series.digits(r"^freedesktop-sdk-(?26\.08\.[0-9]+)$") == ["26", "08"] assert check_renovate_series.digits("freedesktop-sdk-26.08") == ["26", "08"] From 554a410d8527268051f7eed34a165ed7ac3eb4dd Mon Sep 17 00:00:00 2001 From: Jeffrey Sica Date: Tue, 29 Sep 2026 00:15:08 -0500 Subject: [PATCH 3/6] build: remove the gnome-build-meta junction and its patches Also drops the gnome: source alias (only the junction used it) and the elements/freedesktop-sdk.bst comment explaining why FSDK's systemd is not overridden onto gnome-build-meta's. Assisted-by: Claude Opus 5.5 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- elements/freedesktop-sdk.bst | 7 ----- elements/gnome-build-meta.bst | 21 -------------- include/aliases.yml | 1 - .../disable-lorry-mirrors.patch | 28 ------------------- .../upgrade-systemd-v261.patch | 12 -------- tests/unit/test_build_depends.py | 4 +-- 6 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 elements/gnome-build-meta.bst delete mode 100644 patches/gnome-build-meta/disable-lorry-mirrors.patch delete mode 100644 patches/gnome-build-meta/upgrade-systemd-v261.patch diff --git a/elements/freedesktop-sdk.bst b/elements/freedesktop-sdk.bst index a40589b5..b2de51d2 100644 --- a/elements/freedesktop-sdk.bst +++ b/elements/freedesktop-sdk.bst @@ -26,10 +26,3 @@ config: # Our public module signing certificate; FSDK's kernel trusts it and # turns on lockdown (see bluefin-server/keys/linux-module-cert.bst). components/linux-module-cert.bst: bluefin-server/keys/linux-module-cert.bst - - # FSDK 26.08 dropped components/systemd-base.bst, and gnome-build-meta - # (gnome-50 / master) is still pinned to FSDK 25.08 and still depends on it, - # so overriding FSDK's systemd onto gnome-build-meta's fails to load. - # Use FSDK 26.08's own systemd until gnome-build-meta tracks 26.08. - # NOTE: re-evaluate for brew-deps.bst (nspawn machine image), which wanted - # gnome-build-meta's nspawn/container patches. diff --git a/elements/gnome-build-meta.bst b/elements/gnome-build-meta.bst deleted file mode 100644 index 390b75fa..00000000 --- a/elements/gnome-build-meta.bst +++ /dev/null @@ -1,21 +0,0 @@ -kind: junction - -sources: -- kind: git_repo - url: gnome:gnome-build-meta.git - track: gnome-50 -# renovate: datasource=git-refs depName=https://gitlab.gnome.org/GNOME/gnome-build-meta.git - ref: 50.4-0-g8524013485013dd5616bfff02dbeab274d5a4553 -- kind: patch_queue - path: patches/gnome-build-meta - -config: - options: - arch: '%{arch}' - - overrides: - # This along with the patches is required and has to match what gnome-build-meta is using - freedesktop-sdk.bst: freedesktop-sdk.bst - - plugins/buildstream-plugins.bst: plugins/buildstream-plugins.bst - plugins/buildstream-plugins-community.bst: plugins/buildstream-plugins-community.bst diff --git a/include/aliases.yml b/include/aliases.yml index ef9b421a..21a62d59 100644 --- a/include/aliases.yml +++ b/include/aliases.yml @@ -5,6 +5,5 @@ aliases: github: https://github.com/ k8s_dl: https://dl.k8s.io/ gitlab: https://gitlab.com/ - gnome: https://gitlab.gnome.org/GNOME/ crates: https://static.crates.io/ sourceforge_download: https://downloads.sourceforge.net/ diff --git a/patches/gnome-build-meta/disable-lorry-mirrors.patch b/patches/gnome-build-meta/disable-lorry-mirrors.patch deleted file mode 100644 index 5a7b07d7..00000000 --- a/patches/gnome-build-meta/disable-lorry-mirrors.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Dylan Taylor -Date: Fri, 11 Apr 2026 00:00:00 +0000 -Subject: [PATCH] Disable lorry-mirrors to avoid 404/403 fetch failures - -GNOME's lorry-mirrors on gitlab.gnome.org are returning 404/403 for -crate tarballs and git repos, causing hundreds of failed fetches that -must be retried against the original sources. This adds enough overhead -to push CI builds past the 120-minute timeout. - -Remove the mirrors include so fetches go directly to upstream sources -(github.com, static.crates.io, etc). - ---- - project.conf | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/project.conf b/project.conf ---- a/project.conf -+++ b/project.conf -@@ -32,7 +32,6 @@ - (@): - - freedesktop-sdk.bst:include/runtime.yml - - include/aliases.yml --- include/mirrors.yml - - include/shell.yml - - # Options to specify for the project, these provide diff --git a/patches/gnome-build-meta/upgrade-systemd-v261.patch b/patches/gnome-build-meta/upgrade-systemd-v261.patch deleted file mode 100644 index 167a0620..00000000 --- a/patches/gnome-build-meta/upgrade-systemd-v261.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/elements/core-deps/systemd-base.bst b/elements/core-deps/systemd-base.bst -index b6abebd4..0bef9f7d 100644 ---- a/elements/core-deps/systemd-base.bst -+++ b/elements/core-deps/systemd-base.bst -@@ -92,6 +92,7 @@ variables: - -Ddns-servers="%{fallback-dns-servers}" - -Ddefault-dnssec=no - -Didn=true -+ -Dsysinstall=true - -Dman=enabled - -Dhtml=enabled - -Dtpm=true diff --git a/tests/unit/test_build_depends.py b/tests/unit/test_build_depends.py index 63136085..0e6e1b34 100644 --- a/tests/unit/test_build_depends.py +++ b/tests/unit/test_build_depends.py @@ -19,7 +19,7 @@ def test_manual_and_script_elements_depend_on_base_stack(): """Ensure all manual/script elements have base/base-stack.bst in build-depends.""" for bst_path in ELEMENTS_DIR.rglob("*.bst"): # Skip external junction declarations - if bst_path.name in ("freedesktop-sdk.bst", "gnome-build-meta.bst"): + if bst_path.name == "freedesktop-sdk.bst": continue content = bst_path.read_text(encoding="utf-8") @@ -55,7 +55,7 @@ def test_compose_elements_declare_integration_explicitly(): integration (the ld.so cache, hwdb) opt in with integrate: True. """ for bst_path in ELEMENTS_DIR.rglob("*.bst"): - if bst_path.name in ("freedesktop-sdk.bst", "gnome-build-meta.bst"): + if bst_path.name == "freedesktop-sdk.bst": continue content = bst_path.read_text(encoding="utf-8") From 495af17cf957c3e3de90b8792fd04e225e5aaec3 Mon Sep 17 00:00:00 2001 From: Jeffrey Sica Date: Tue, 29 Sep 2026 00:15:08 -0500 Subject: [PATCH 4/6] docs: freedesktop-sdk.bst is the only junction Assisted-by: Claude Opus 5.5 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- SECURITY.md | 2 +- docs/skills/bump-fsdk-version.md | 7 +++++-- docs/skills/ci-tooling.md | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 83a39f86..86b031c4 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -66,7 +66,7 @@ This policy covers everything this repository produces and its build pipeline: - Release signing and the `systemd-sysupdate` update/verification flow. **Out of scope:** vulnerabilities in upstream components such as -freedesktop-sdk, GNOME build metadata, systemd, or k0s itself. Report those to +freedesktop-sdk, systemd, or k0s itself. Report those to the respective upstream project; report to this repository only when the issue is introduced by our integration, build, signing, or packaging of the component. diff --git a/docs/skills/bump-fsdk-version.md b/docs/skills/bump-fsdk-version.md index 541f2df1..2aa9c035 100644 --- a/docs/skills/bump-fsdk-version.md +++ b/docs/skills/bump-fsdk-version.md @@ -68,7 +68,10 @@ Before merging a bump: - Bumping across a minor line (for example, 25.08 → 26.08) may rename/relocate components or restructure runtime stacks: - In FSDK 26.08, `public-stacks/runtime-minimal.bst` drops bash and coreutils, which moved to `public-stacks/runtime-gnu.bst`. Stacks whose components carry shell integration commands (like `elements/base/base-stack.bst` for `ldconfig` and `ca-certificates`) need `public-stacks/runtime-gnu.bst` in `depends:`. - - `components/systemd-base.bst` was dropped in FSDK 26.08, and FSDK now ships its own systemd directly, so the previous `gnome-build-meta` systemd overrides were removed from `elements/freedesktop-sdk.bst`. + - `components/systemd-base.bst` was dropped in FSDK 26.08, and FSDK now ships its own systemd directly. +- `freedesktop-sdk.bst` is the only junction. `project.conf` takes FSDK's + `include/runtime.yml` and the `collect_initial_scripts` plugin straight from + it; there is no gnome-build-meta junction to keep in step. - A point-release tag is immutable: once a GitHub Release for a given `image-version` is published, never republish different bits under it. - **Only one CAS-config patch remains.** FSDK 26.08 absorbed the old `0001` CAS-limits patch (upstream `project.conf` sets `retry-limit`/`retry-delay`/`request-timeout` itself), so `patches/freedesktop-sdk/` carries only `0001-project.conf-Add-GNOME-CAS-servers.patch`. @@ -82,7 +85,7 @@ Before merging a bump: Point releases are delivered by the scheduled `track-junctions.yml` workflow. - **Trigger:** `track-junctions.yml` runs daily and resolves the junction's own `track: freedesktop-sdk-26.08*` glob; it does not wait on a Renovate PR. -- **Mechanism:** `track-junctions.yml` runs `just bst source track freedesktop-sdk.bst` (alongside `gnome-build-meta.bst`, which overrides it), syncs `project.conf`'s `installer-version` to the tracked point release, and opens its own PR on `auto/track-junctions`. It never runs on `pull_request`, so a junction bump can never be injected into an unrelated dependency PR. +- **Mechanism:** `track-junctions.yml` runs `just bst source track freedesktop-sdk.bst`, syncs `project.conf`'s `installer-version` to the tracked point release, and opens its own PR on `auto/track-junctions`. It never runs on `pull_request`, so a junction bump can never be injected into an unrelated dependency PR. - **Build Loop:** When the PR is merged to `main`, GitHub Actions compiles the image set (OS DDI, UKIs, netboot ESP) and sysexts, and publishes them to a new GitHub Release tagged `v`. ## See also diff --git a/docs/skills/ci-tooling.md b/docs/skills/ci-tooling.md index 4eb28c2e..d5e681a9 100644 --- a/docs/skills/ci-tooling.md +++ b/docs/skills/ci-tooling.md @@ -115,7 +115,7 @@ sudo_cmd := if `podman info >/dev/null 2>&1 && echo 1 || echo 0` == "1" { "" } e | Job | Workflow | Trigger | Purpose | |-----|----------|---------|---------| -| `track-junctions` | `track-junctions.yml` | `schedule` (08:00 UTC), `workflow_dispatch` | Resolves the `freedesktop-sdk.bst` + `gnome-build-meta.bst` junction refs, syncs `project.conf`'s `installer-version`, and opens/updates its own PR on `auto/track-junctions`. `contents: write` + `pull-requests: write`, never on `pull_request`. | +| `track-junctions` | `track-junctions.yml` | `schedule` (08:00 UTC), `workflow_dispatch` | Resolves the `freedesktop-sdk.bst` junction ref, syncs `project.conf`'s `installer-version`, and opens/updates its own PR on `auto/track-junctions`. `contents: write` + `pull-requests: write`, never on `pull_request`. | | `build` | `build.yml` | `pull_request`, `push/main`, `workflow_dispatch` | Resolves the element graph, sets `image-version`, and runs the full BuildStream compile of the image set (OS DDI, signed UKIs, netboot ESP, k0s/KubeStellar/OpenZFS sysext assets), which also writes and signs the combined `SHA256SUMS` inside `oci/bluefin-server-image.bst`. On `main` it installs the `BOOT_KEYS_TARBALL` and `SYSUPDATE_SIGNING_KEY` secrets; both are required there. Read-only token. | | `boot-test` | `build.yml` | `pull_request`, `push/main`, `workflow_dispatch` | Downloads the build job's exported image set and runs the Secure Boot QEMU checks: `scripts/dogfood-diskless.sh --check` (diskless boot) and `scripts/dogfood-install.sh` (install to disk and boot it). Read-only token. | | `release` | `build.yml` | `push/main`, `workflow_dispatch` | Publishes `dist/diskless/` as-is: an immutable GitHub Release tagged `v` plus an ORAS OCI artifact at `ghcr.io//bluefin-server:,latest` (one layer per file, artifact type `application/vnd.projectbluefin.server.release.v1`) (`if: ${{ !failure() && !cancelled() && github.ref == 'refs/heads/main' }}`). `contents: write` + `packages: write`. | @@ -129,8 +129,8 @@ uploaded to a GitHub Release tagged `v` (`YY.MM.` on main). ## Core Process 1. **Renovate tracking:** `renovate.json` is configured with a custom regex - manager to scan BuildStream junction files (`freedesktop-sdk.bst` and - `gnome-build-meta.bst`) using the `git-refs` datasource. + manager to scan the BuildStream junction (`freedesktop-sdk.bst`) using the + `git-refs` datasource. 2. **Auto-resolution:** The scheduled `track-junctions` workflow executes `just bst source track` to resolve raw tags to full `git-describe` refs, syncs `installer-version` to the tracked FSDK point release, and proposes the From 84f5ccbeee262ac3f25ad10142d9de898b871591 Mon Sep 17 00:00:00 2001 From: Jeffrey Sica Date: Tue, 29 Sep 2026 00:15:24 -0500 Subject: [PATCH 5/6] fix(ci): sync installer-version, not release-version, on junction bumps project.conf renamed release-version to installer-version, but the tracker's sed still matched release-version. It changed nothing, so an FSDK point-release bump failed check-release-version.py before opening its PR. Assisted-by: Claude Opus 5.5 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/workflows/track-junctions.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/track-junctions.yml b/.github/workflows/track-junctions.yml index 8f13ed46..751ac6ae 100644 --- a/.github/workflows/track-junctions.yml +++ b/.github/workflows/track-junctions.yml @@ -65,11 +65,11 @@ jobs: # track" and let the run report success having resolved nothing. just bst source track freedesktop-sdk.bst - - name: Sync release-version to the tracked FSDK point release + - name: Sync installer-version to the tracked FSDK point release run: | set -euo pipefail - # project.conf's release-version names every published OS asset and - # must equal the FSDK point release; check-release-version.py fails + # project.conf's installer-version must equal the FSDK point + # release; check-release-version.py fails # closed on drift and is the first thing `just validate` runs. Without # this step an FSDK bump would open a PR that dies in seconds at # "Validate Element Graph" — exactly the failure the old job produced. @@ -78,7 +78,7 @@ jobs: echo "ERROR: tracked freedesktop-sdk.bst ref carries no X.Y.Z point release" >&2 exit 1 fi - sed -i -E "s|^([[:space:]]*release-version:[[:space:]]*).*|\1\"${pinned}\"|" project.conf + sed -i -E "s|^([[:space:]]*installer-version:[[:space:]]*).*|\1\"${pinned}\"|" project.conf # Assert before opening the PR; a failure here means the sync broke. python3 .github/scripts/check-release-version.py @@ -116,7 +116,7 @@ jobs: echo "| --- | --- | --- |" echo "| \`elements/freedesktop-sdk.bst\` | \`${old_fsdk}\` | \`${new_fsdk}\` |" echo "" - echo "\`project.conf\`'s \`release-version\` is synced to the pinned FSDK point" + echo "\`project.conf\`'s \`installer-version\` is synced to the pinned FSDK point" echo "release in the same commit, because \`check-release-version.py\` fails closed" echo "on drift between the two." echo "" From 3c046dfb5489c74696b897c15eabca84bc34801e Mon Sep 17 00:00:00 2001 From: Jeffrey Sica Date: Tue, 29 Sep 2026 10:54:11 -0500 Subject: [PATCH 6/6] docs(ci-tooling): restore the job rows dropped in the main merge Assisted-by: Claude Opus 5.5 via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- docs/skills/ci-tooling.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docs/skills/ci-tooling.md b/docs/skills/ci-tooling.md index daa9e876..b082face 100644 --- a/docs/skills/ci-tooling.md +++ b/docs/skills/ci-tooling.md @@ -116,6 +116,10 @@ sudo_cmd := if `podman info >/dev/null 2>&1 && echo 1 || echo 0` == "1" { "" } e | Job | Workflow | Trigger | Purpose | |-----|----------|---------|---------| +| `track-junctions` | `track-junctions.yml` | `schedule` (08:00 UTC), `workflow_dispatch` | Resolves the `freedesktop-sdk.bst` junction ref, syncs `project.conf`'s `installer-version`, and opens/updates its own PR on `auto/track-junctions`. `contents: write` + `pull-requests: write`, never on `pull_request`. | +| `changes` | `build.yml` | `pull_request`, `push/main`, `workflow_dispatch` | Decides whether `build` and `boot-test` run: always outside pull requests; on a pull request only if `.github/scripts/image-build-needed.py`, checked out from the PR's base revision, finds a changed path that can reach the image set or the boot test (see [Build time and caches](#build-time-and-caches)). `contents: read` + `pull-requests: read`. | +| `build` | `build.yml` | `pull_request`, `push/main`, `workflow_dispatch` | Resolves the element graph, sets `image-version`, and runs the full BuildStream compile of the image set (OS DDI, signed UKIs, netboot ESP, k0s/KubeStellar/OpenZFS sysext assets), which also writes and signs the combined `SHA256SUMS` inside `oci/bluefin-server-image.bst`. On `main` it installs the `BOOT_KEYS_TARBALL` and `SYSUPDATE_SIGNING_KEY` secrets; both are required there. Off `main` it also exports two higher-versioned sets (`1..1`, `1..2`) for the update test. Read-only token. | +| `boot-test` | `build.yml` | `pull_request`, `push/main`, `workflow_dispatch` | Runs the Secure Boot QEMU checks on the exported sets (see Core Process step 4). Read-only token. | | `release` | `build.yml` | `push/main`, `workflow_dispatch` | Publishes `dist/diskless/` as-is: an immutable GitHub Release tagged `v` plus an ORAS OCI artifact at `ghcr.io//bluefin-server:,latest` (one layer per file, artifact type `application/vnd.projectbluefin.server.release.v1`) (`if: ${{ !failure() && !cancelled() && github.ref == 'refs/heads/main' }}`). `contents: write` + `packages: write`. | | `docs` | `docs-checks.yml` | `pull_request`, `push/main` | Runs markdown and skill metadata checks via `docs-checks.py`. Read-only token. | | `unit` | `unit-tests.yml` | `pull_request`, `push/main` | Runs pytest and BATS unit test suites. Read-only token. |