Skip to content

Commit 740a38b

Browse files
committed
Auto merge of #136571 - marcoieni:ubuntu-24-large-runners, r=<try>
ci: use ubuntu 24 for large runners try-job: dist-powerpc64le-linux try-job: x86_64-gnu-debug try-job: dist-aarch64-linux try-job: dist-arm-linux try-job: x86_64-fuchsia try-job: x86_64-gnu-distcheck try-job: dist-x86_64-linux try-job: dist-x86_64-linux-alt try-job: dist-aarch64-linux
2 parents 820bfff + 914c894 commit 740a38b

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

.github/workflows/ci.yml

+2
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,8 @@ jobs:
236236
DD_GITHUB_JOB_NAME: ${{ matrix.full_name }}
237237
run: |
238238
cd src/ci
239+
echo "npm version:"
240+
npm version
239241
npm ci
240242
python3 scripts/upload-build-metrics.py ../../build/cpu-usage.csv
241243

src/ci/github-actions/jobs.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ runners:
1212

1313
# Large runner used mainly for its bigger disk capacity
1414
- &job-linux-4c-largedisk
15-
os: ubuntu-22.04-4core-16gb
15+
os: ubuntu-24.04-4core-16gb
1616
<<: *base-job
1717

1818
- &job-linux-8c
19-
os: ubuntu-22.04-8core-32gb
19+
os: ubuntu-24.04-8core-32gb
2020
<<: *base-job
2121

2222
- &job-linux-16c
23-
os: ubuntu-22.04-16core-64gb
23+
os: ubuntu-24.04-16core-64gb
2424
<<: *base-job
2525

2626
- &job-macos-xl
@@ -53,7 +53,7 @@ runners:
5353
os: ubuntu-24.04-arm
5454

5555
- &job-aarch64-linux-8c
56-
os: ubuntu-22.04-arm64-8core-32gb
56+
os: ubuntu-24.04-arm64-8core-32gb
5757
envs:
5858
env-x86_64-apple-tests: &env-x86_64-apple-tests
5959
SCRIPT: ./x.py --stage 2 test --skip tests/ui --skip tests/rustdoc -- --exact

0 commit comments

Comments
 (0)