Skip to content

Commit e749205

Browse files
committed
Merge bitcoin/bitcoin#33319: ci: reduce runner sizes on various jobs
5eeb2fa ci: reduce runner sizes on various jobs (will) Pull request description: These jobs can likely use reduced runner sizes to avoid wasting our CPU quota, as much of the long-running part of the job is single-threaded. This will also give us more (job) parallelisem from the same number of CPU that we are using. Suggested in: bitcoin/bitcoin#32989 (comment) ACKs for top commit: kevkevinpal: ACK [5eeb2fa](bitcoin/bitcoin@5eeb2fa) m3dwards: ACK 5eeb2fa janb84: ACK 5eeb2fa Tree-SHA512: 6fb0352bc40623dd63b9bd6169d753d1ec9667c272445fda7a2db8bbedfa35350a51d08c1adf3fa5e070e84855c3f491668726d3c7ded07a39f2f9c63edacefc
2 parents 9cbd346 + 5eeb2fa commit e749205

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ jobs:
309309
windows-cross:
310310
name: 'Linux->Windows cross, no tests'
311311
needs: runners
312-
runs-on: ${{ needs.runners.outputs.use-cirrus-runners == 'true' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md' || 'ubuntu-24.04' }}
312+
runs-on: ${{ needs.runners.outputs.use-cirrus-runners == 'true' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm' || 'ubuntu-24.04' }}
313313
if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
314314

315315
env:
@@ -440,7 +440,7 @@ jobs:
440440
file-env: './ci/test/00_setup_env_arm.sh'
441441

442442
- name: 'ASan + LSan + UBSan + integer, no depends, USDT'
443-
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg' # has to match container in ci/test/00_setup_env_native_asan.sh for tracing tools
443+
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md' # has to match container in ci/test/00_setup_env_native_asan.sh for tracing tools
444444
fallback-runner: 'ubuntu-24.04'
445445
timeout-minutes: 120
446446
file-env: './ci/test/00_setup_env_native_asan.sh'
@@ -452,7 +452,7 @@ jobs:
452452
file-env: './ci/test/00_setup_env_mac_cross.sh'
453453

454454
- name: 'No wallet, libbitcoinkernel'
455-
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
455+
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm'
456456
fallback-runner: 'ubuntu-24.04'
457457
timeout-minutes: 120
458458
file-env: './ci/test/00_setup_env_native_nowallet_libbitcoinkernel.sh'
@@ -488,7 +488,7 @@ jobs:
488488
file-env: './ci/test/00_setup_env_native_tidy.sh'
489489

490490
- name: 'TSan, depends, no gui'
491-
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-lg'
491+
cirrus-runner: 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-md'
492492
fallback-runner: 'ubuntu-24.04'
493493
timeout-minutes: 120
494494
file-env: './ci/test/00_setup_env_native_tsan.sh'
@@ -535,7 +535,7 @@ jobs:
535535
lint:
536536
name: 'lint'
537537
needs: runners
538-
runs-on: ${{ needs.runners.outputs.use-cirrus-runners == 'true' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-sm' || 'ubuntu-24.04' }}
538+
runs-on: ${{ needs.runners.outputs.use-cirrus-runners == 'true' && 'ghcr.io/cirruslabs/ubuntu-runner-amd64:24.04-xs' || 'ubuntu-24.04' }}
539539
if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
540540
timeout-minutes: 20
541541
env:

0 commit comments

Comments
 (0)