Fixes: #33735
Correct runner type selection for the lint job.
This was erroneously left-out during refactor of the runner selection mechanism in #33302 causing the lint job to run on GH hosts (and therefore not be able to acces local cirrus caches).
Fixes: 33735
Correct runner type selection for the lint job.
This was erroneously left-out during refactor of the runner selection
mechanism in #33302 causing the lint job to run on GH hosts (and
therefore not be able to acces local cirrus caches).
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/33744.
<!--021abf342d371248e50ceaed478a90ca-->
See the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
<!--5faf32d7da4f0f540f40219e4f7537a3-->
lgtm ACK 0b3b8a3be1a0db0dfc634acca1d9305dc0fbfae6
This is now selecting the correct provider.
Some follow-up ideas:
I ran codex -c model=gpt-5-mini --dangerously-bypass-approvals-and-sandbox exec 'Review the top commit' on ff18b6bbaf322739fe98fd51b0d89d65a5775ab5 for fun, and it printed:
**Potential issue I found**
- In `action.yml` the `cache-provider` `options` list contains `gh`:
- `.github/actions/configure-docker/action.yml:4`
- But the workflow sets `provider=gha` in `ci.yml` (`echo "provider=gha" >> "$GITHUB_OUTPUT"`).
Which looks real. I guess given that GitHub seems to ignore if wrong options are passed and doesn't do any validation anyway, it seems fine to remove them?
Also, could use a yaml anchor to re-use the snippet and specify the runners verbosely for the lint as well:
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-xs'
fallback-runner: 'ubuntu-24.04'
But those are just nits. Feel free to ignore them.
I think it would make sense to include here.
ACK 0b3b8a3be1a0db0dfc634acca1d9305dc0fbfae6, I have reviewed the code and it looks OK.
The options used were wrong in two ways: firstly they were not enforced
as a "choice" (i.e. invalid input valudes could be provided without
error) and one of the options was listed as `gh` when we passed it as
`gha` from ci.yml.
"Fix" this by removing the choice altogether but sanity-testing the
input value against an expected list using a GHA "warning" to notify of
unknown inputs.
Sorry for the slow turnaround.
I pushed an additional commit to address (half of) @maflcko's nits. He is correct that GHA apparently does not validate inputs (even if you set type: choice), so it makes sense to remove the options. In order that we not miss if the wrong option is passed here in the future I added a sanity check which will annotate the CI run with a Warning when an unknown input is detected. See the bottom of the annotations of this run for what that looks like: https://github.com/willcl-ark/bitcoin/actions/runs/19039344679
3 | @@ -4,12 +4,21 @@ inputs: 4 | cache-provider: 5 | description: 'gha or cirrus cache provider' 6 | required: true 7 | - options: 8 | - - gh 9 | - - cirrus
Yep, I think the original implementation got wires crossed with workflow dispatch inputs https://docs.github.com/en/actions/reference/workflows-and-actions/workflow-syntax#example-of-onworkflow_dispatchinputs
ACK 7632e0ba312a372259897c68fd7c7eb723df3738.
Didn't look at the second commit, which is written in Bash, but I guess this is harmless and fine either way.
re-ACK 7632e0ba312a372259897c68fd7c7eb723df3738 📞
<details><summary>Show signature</summary>
Signature:
untrusted comment: signature from minisign secret key on empty file; verify via: minisign -Vm "${path_to_any_empty_file}" -P RWTRmVTMeKV5noAMqVlsMugDDCyyTSbA3Re5AkUrhvLVln0tSaFWglOw -x "${path_to_this_whole_four_line_signature_blob}"
RUTRmVTMeKV5npGrKx1nqXCw5zeVHdtdYURB/KlyA/LMFgpNCs+SkW9a8N95d+U4AP1RJMi+krxU1A3Yux4bpwZNLvVBKy0wLgM=
trusted comment: re-ACK 7632e0ba312a372259897c68fd7c7eb723df3738 📞
Wsj9jTyJ6hXdXzBRMaD6VfTIDzB+tNr/XZ8/PQRjnFNEFVI69yWaecnfLehm0JYzTWUz1H8zm72xzAnaCiGEBw==
</details>