Skip to content

ci: land #190, #189 and #84 with the build.yml conflict resolved - #217

Merged
castrojo merged 12 commits into
mainfrom
ci/pin-just-and-expand-paths
Sep 20, 2026
Merged

castrojo merged 12 commits into
mainfrom
ci/pin-just-and-expand-paths

Conversation

@castrojo

Copy link
Copy Markdown
Contributor

Carries three fork PRs that cannot be merged through the API directly: GitHub refuses to merge workflow changes originating from a fork without workflow scope on the token, which is the security boundary and not something to work around. Re-landing them from an in-repo branch instead, with the conflict resolved.

The conflict

#190 predates #180, which deleted the track-refs job from build.yml and replaced it with the scheduled track-junctions.yml. #190 had pinned just inside the job that no longer exists.

Resolved by keeping #180's deletion and applying #190's intent to the file it could not have known about: track-junctions.yml installed just unpinned. All four call sites are now pinned:

track-junctions.yml:58   tool: just@1.58.0
build.yml:39             tool: just@1.58.0
kernel.yml:42            tool: just@1.58.0
unit-tests.yml:58        tool: just@1.58.0

Verification

  • actionlint clean
  • pytest tests/unit 284 passed, 1 xfailed
  • bats tests/unit 91 passed
  • docs-checks.py, check-release-version.py, check-renovate-series.py all pass

Closes #190, closes #189, closes #84. Refs #188, #187.

Assisted-by: Claude Opus 4.5 via GitHub Copilot
Co-authored-by: Copilot 223556219+Copilot@users.noreply.github.com

hanthor and others added 12 commits September 10, 2026 10:23
… tracks

renovate.json filters freedesktop-sdk tags with

    "extractVersion": "^freedesktop-sdk-(?<version>25\\.08\\.[0-9]+)$"

while elements/freedesktop-sdk.bst has tracked 26.08 since the bump to
freedesktop-sdk-26.08.0-0-gdb97cce:

    track: freedesktop-sdk-26.08*
    ref: freedesktop-sdk-26.08.0-0-gdb97cce32cecadc7a3e98f06d557ebfa6ba9ad46

No tag upstream publishes can match that rule any more, so Renovate reports
no updates rather than an error. The junction silently stops receiving bumps
and the track-refs job in build.yml never has a ref to resolve. Nothing in
any log says so — the failure looks exactly like "already up to date".

Bumps the rule to 26.08, and adds check-renovate-series.py so the pair cannot
drift apart again: it reads the series out of each junction's `track:` glob
and asserts the matching extractVersion is anchored to the same one, failing
closed. Same shape as check-release-version.py and check-k0s-version.py —
wired into .pre-commit-config.yaml, and unit-tests.yml now also fires on
renovate.json and elements/*.bst so the guard runs when either side moves.

tests/unit/test_check_renovate_series.py covers the passing case, the exact
regression above, a junction with no packageRule, a junction with no
`track:`, the two series helpers, and the checked-in tree itself.

    $ python3 -m pytest tests/unit -q
    207 passed, 1 xfailed in 0.64s

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VwEniffvKGH7gHfqKneuaJ
`check-renovate-series.py` was wired into pre-commit and the unit suite
but not into `just validate`, unlike its siblings
`check-release-version.py` and `check-k0s-version.py`. Since AGENTS.md
and docs/skills/ci-tooling.md point contributors at `just validate` as
the merge-contract check, the new invariant was effectively unenforced
there.

Assisted-by: Claude Opus 4.6 via GitHub Copilot
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Trigger unit tests on changes to elements/**, include/**,
project.conf, .pre-commit-config.yaml, and .github/workflows/build.yml,
which are read and asserted by the unit test suite.

Fixes #187

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: mrbobbytables <mrbobbytables@users.noreply.github.com>
taiki-e/install-action resolves just@latest at run time when no version
is supplied, so the build tool that drives every job (just validate,
just test-unit, DDI/kernel export recipes) was unpinned while every
GitHub Action in the repo is SHA-pinned. Pin just to 1.58.0, the
version CI already installs, so this changes no runtime behavior.

Signed-off-by: hive-agent <hive-agent@users.noreply.github.com>
The skill doc's install snippet still showed an unpinned 'tool: just', which is
the form issue #188 removed from the workflows. A workflow copied from the doc
would have reintroduced it, undoing this PR on the next new job.

Update the snippet to 'tool: just@1.58.0', matching all four call sites, and
explain that without a version install-action resolves just@latest at run time.
Note that the version is repeated per call site so a bump has to change all of
them in one commit.

Add the half-done pin to Red Flags, add a checklist item for it under
Verification, and record the 'tool: just always installs a working version'
rationalization.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
# Conflicts:
#	.github/workflows/build.yml
@castrojo
castrojo merged commit c3bd1fe into main Sep 20, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants