Skip to content

Commit 9b9d223

Browse files
committed
ci: use ubuntu-latest instead of ubuntu-24.04
To match the usage of -latest for the warp runners.
1 parent 5dac53b commit 9b9d223

1 file changed

Lines changed: 16 additions & 16 deletions

File tree

.github/workflows/ci.yml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
test-each-commit:
5858
name: 'test ancestor commits'
5959
needs: runners
60-
runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-8x' || 'ubuntu-24.04' }}
60+
runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-8x' || 'ubuntu-latest' }}
6161
env:
6262
TEST_RUNNER_PORT_MIN: "14000" # Use a larger port range to avoid colliding with other CI services.
6363
if: github.event_name == 'pull_request' && github.event.pull_request.commits != 1
@@ -325,7 +325,7 @@ jobs:
325325
windows-cross:
326326
name: 'Windows-cross to x86_64, ${{ matrix.crt }}'
327327
needs: [runners, record-frozen-commit]
328-
runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-4x' || 'ubuntu-24.04' }}
328+
runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-4x' || 'ubuntu-latest' }}
329329
if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
330330

331331
strategy:
@@ -448,7 +448,7 @@ jobs:
448448
include:
449449
- name: 'iwyu'
450450
warp-runner: 'warp-ubuntu-latest-x64-8x'
451-
fallback-runner: 'ubuntu-24.04'
451+
fallback-runner: 'ubuntu-latest'
452452
timeout-minutes: 120
453453
file-env: './ci/test/00_setup_env_native_iwyu.sh'
454454

@@ -467,73 +467,73 @@ jobs:
467467

468468
- name: 'macOS-cross to arm64'
469469
warp-runner: 'warp-ubuntu-latest-x64-4x'
470-
fallback-runner: 'ubuntu-24.04'
470+
fallback-runner: 'ubuntu-latest'
471471
timeout-minutes: 120
472472
file-env: './ci/test/00_setup_env_mac_cross.sh'
473473

474474
- name: 'macOS-cross to x86_64'
475475
warp-runner: 'warp-ubuntu-latest-x64-4x'
476-
fallback-runner: 'ubuntu-24.04'
476+
fallback-runner: 'ubuntu-latest'
477477
timeout-minutes: 120
478478
file-env: './ci/test/00_setup_env_mac_cross_intel.sh'
479479

480480
- name: 'FreeBSD Cross'
481481
warp-runner: 'warp-ubuntu-latest-x64-8x'
482-
fallback-runner: 'ubuntu-24.04'
482+
fallback-runner: 'ubuntu-latest'
483483
timeout-minutes: 120
484484
file-env: './ci/test/00_setup_env_freebsd_cross.sh'
485485

486486
- name: 'No wallet'
487487
warp-runner: 'warp-ubuntu-latest-x64-4x'
488-
fallback-runner: 'ubuntu-24.04'
488+
fallback-runner: 'ubuntu-latest'
489489
timeout-minutes: 120
490490
file-env: './ci/test/00_setup_env_native_nowallet.sh'
491491

492492
- name: 'i686, no IPC'
493493
warp-runner: 'warp-ubuntu-latest-x64-8x'
494-
fallback-runner: 'ubuntu-24.04'
494+
fallback-runner: 'ubuntu-latest'
495495
timeout-minutes: 120
496496
file-env: './ci/test/00_setup_env_i686_no_ipc.sh'
497497

498498
- name: 'fuzzer,address,undefined,integer'
499499
warp-runner: 'warp-ubuntu-latest-x64-16x'
500-
fallback-runner: 'ubuntu-24.04'
500+
fallback-runner: 'ubuntu-latest'
501501
timeout-minutes: 240
502502
file-env: './ci/test/00_setup_env_native_fuzz.sh'
503503

504504
- name: 'previous releases'
505505
warp-runner: 'warp-ubuntu-latest-x64-8x'
506-
fallback-runner: 'ubuntu-24.04'
506+
fallback-runner: 'ubuntu-latest'
507507
timeout-minutes: 120
508508
file-env: './ci/test/00_setup_env_native_previous_releases.sh'
509509

510510
- name: 'Alpine (musl)'
511511
warp-runner: 'warp-ubuntu-latest-x64-8x'
512-
fallback-runner: 'ubuntu-24.04'
512+
fallback-runner: 'ubuntu-latest'
513513
timeout-minutes: 120
514514
file-env: './ci/test/00_setup_env_native_alpine_musl.sh'
515515

516516
- name: 'tidy'
517517
warp-runner: 'warp-ubuntu-latest-x64-8x'
518-
fallback-runner: 'ubuntu-24.04'
518+
fallback-runner: 'ubuntu-latest'
519519
timeout-minutes: 120
520520
file-env: './ci/test/00_setup_env_native_tidy.sh'
521521

522522
- name: 'TSan'
523523
warp-runner: 'warp-ubuntu-latest-x64-8x'
524-
fallback-runner: 'ubuntu-24.04'
524+
fallback-runner: 'ubuntu-latest'
525525
timeout-minutes: 120
526526
file-env: './ci/test/00_setup_env_native_tsan.sh'
527527

528528
- name: 'MSan, fuzz'
529529
warp-runner: 'warp-ubuntu-latest-x64-8x'
530-
fallback-runner: 'ubuntu-24.04'
530+
fallback-runner: 'ubuntu-latest'
531531
timeout-minutes: 150
532532
file-env: './ci/test/00_setup_env_native_fuzz_with_msan.sh'
533533

534534
- name: 'MSan'
535535
warp-runner: 'warp-ubuntu-latest-x64-16x'
536-
fallback-runner: 'ubuntu-24.04'
536+
fallback-runner: 'ubuntu-latest'
537537
timeout-minutes: 120
538538
file-env: './ci/test/00_setup_env_native_msan.sh'
539539

@@ -576,7 +576,7 @@ jobs:
576576
lint:
577577
name: 'lint'
578578
needs: runners
579-
runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-2x' || 'ubuntu-24.04' }}
579+
runs-on: ${{ needs.runners.outputs.provider == 'warp' && 'warp-ubuntu-latest-x64-2x' || 'ubuntu-latest' }}
580580
if: ${{ vars.SKIP_BRANCH_PUSH != 'true' || github.event_name == 'pull_request' }}
581581
timeout-minutes: 20
582582
env:

0 commit comments

Comments
 (0)