{ci/eval,release}: migrate supported systems to top-level#492103
{ci/eval,release}: migrate supported systems to top-level#492103mdaniels5757 merged 2 commits intoNixOS:masterfrom
top-level#492103Conversation
92c5964 to
84d860a
Compare
84d860a to
33fdc07
Compare
33fdc07 to
bc6d1ef
Compare
|
Not sure if the merge group failures are blocking or not; they don’t block queue entry, but I’m not sure if they’d happen the same way on merge. If they would, then I can split the creation of |
.github/workflows/eval.yml
Outdated
| systems: | ||
| runs-on: ubuntu-slim | ||
| outputs: | ||
| systems: ${{ steps.systems.outputs.systems }} | ||
| steps: | ||
| - name: Check out the the target branch | ||
| uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 | ||
| with: | ||
| persist-credentials: false | ||
| ref: ${{ inputs.targetSha }} | ||
| path: trusted | ||
| sparse-checkout: | | ||
| pkgs/top-level/release-supported-systems.json | ||
|
|
||
| - name: Load supported systems | ||
| id: systems | ||
| # We need to use jq here to ensure the output is one line. | ||
| run: | | ||
| jq -r '"systems=\(@json)"' \ | ||
| trusted/pkgs/top-level/release-supported-systems.json \ | ||
| >> "$GITHUB_OUTPUT" |
There was a problem hiding this comment.
You can save running an extra job by just doing an API call to get that file from the right branch in the prepare jobs and then pass on the systems value the same as before.
Example here:
nixpkgs/.github/actions/checkout/action.yml
Lines 44 to 57 in 027294e
There was a problem hiding this comment.
Oh, I migrated this to the API but missed the part about doing it in the prepare job… I’ll fix that now. I also split that part into #493997 so that we don’t break CI on any branch with the file migration.
There was a problem hiding this comment.
I believe I have done this correctly now, and hopefully once this is merged and backported, pre‐merge CI on the follow‐up will succeed on a re‐run.
bc6d1ef to
d824ca3
Compare
top-level
The supported systems can differ across release branches. The original file is kept until the GitHub CI is migrated.
For consistency with `release.nix`.
d824ca3 to
1e7a16f
Compare
There was a problem hiding this comment.
LGTM!
(This PR doesn't change ci/github-script/prepare.js to use the new file, but that doesn't matter because the ci/supportedSystems.json file still exists, and changing prepare.js to use pkgs/top-level/release-supported-systems.json in the follow-up PR will work because both files will exist on the follow-up PR's base branch once this is merged).
|
Successfully created backport PR for |
Things done
passthru.tests.nixpkgs-reviewon this PR. See nixpkgs-review usage../result/bin/.