Merge bitcoin/bitcoin#33744: ci: Fix lint runner selection (and docker cache)
7632e0ba31ci: fix configure docker action inputs (will)0b3b8a3be1ci: fix lint docker caching (will) Pull request description: 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). ACKs for top commit: maflcko: re-ACK7632e0ba31📞 hebasto: ACK7632e0ba31. Tree-SHA512: b228a79d13ed80c75fc5e51c4fb93c7fad1cb33c00a659afe65033ce09d95e6ac84e01627f2e58e640ff483d798ac1b9e23f14d31a9c045fd99367059ceef5b4
This commit is contained in:
2 files changed
+13
-4
No files matched your search
@@ -4,12 +4,21 @@ inputs:
|
|||||||
cache-provider:
|
cache-provider:
|
||||||
description: 'gha or cirrus cache provider'
|
description: 'gha or cirrus cache provider'
|
||||||
required: true
|
required: true
|
||||||
options:
|
|
||||||
- gh
|
|
||||||
- cirrus
|
|
||||||
runs:
|
runs:
|
||||||
using: 'composite'
|
using: 'composite'
|
||||||
steps:
|
steps:
|
||||||
|
- name: Check inputs
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
# We expect only gha or cirrus as inputs to cache-provider
|
||||||
|
case "${{ inputs.cache-provider }}" in
|
||||||
|
gha|cirrus)
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
echo "::warning title=Unknown input to configure docker action::Provided value was ${{ inputs.cache-provider }}"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v3
|
uses: docker/setup-buildx-action@v3
|
||||||
with:
|
with:
|
||||||
|
|||||||
@@ -574,7 +574,7 @@ jobs:
|
|||||||
lint:
|
lint:
|
||||||
name: 'lint'
|
name: 'lint'
|
||||||
needs: runners
|
needs: runners
|
||||||
runs-on: ${{ needs.runners.outputs.use-cirrus-runners == 'true' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-xs' || 'ubuntu-24.04' }}
|
runs-on: ${{ needs.runners.outputs.provider == 'cirrus' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-xs' || 'ubuntu-24.04' }}
|
||||||
if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
|
if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
|
||||||
timeout-minutes: 20
|
timeout-minutes: 20
|
||||||
env:
|
env:
|
||||||
|
|||||||
Reference in new issue
Block a user