Skip to content

Commit

Permalink
Rollup merge of #132409 - MarcoIeni:ci-remove-linux-4c-large, r=Kobzol
Browse files Browse the repository at this point in the history
CI: switch 7 linux jobs to free runners

try-job: x86_64-gnu-aux
try-job: x86_64-gnu-nopt
try-job: x86_64-gnu-tools
  • Loading branch information
matthiaskrgr authored Nov 5, 2024
2 parents c8247c0 + 02b3415 commit 0078e64
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,7 @@ jobs:
# less disk space.
- name: free up disk space
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
if: contains(matrix.os, 'ubuntu')
with:
# Removing packages with APT saves ~5 GiB, but takes several
# minutes (and potentially removes important packages).
large-packages: false
if: matrix.free_disk

# Rust Log Analyzer can't currently detect the PR number of a GitHub
# Actions build on its own, so a hint in the log message is needed to
Expand Down
16 changes: 9 additions & 7 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ runners:

- &job-linux-4c
os: ubuntu-20.04
# Free some disk space to avoid running out of space during the build.
free_disk: true
<<: *base-job

# Large runner used mainly for its bigger disk capacity
Expand Down Expand Up @@ -135,7 +137,7 @@ auto:
- image: dist-aarch64-linux
env:
CODEGEN_BACKENDS: llvm,cranelift
<<: *job-linux-4c-largedisk
<<: *job-linux-4c

- image: dist-android
<<: *job-linux-4c
Expand All @@ -156,28 +158,28 @@ auto:
<<: *job-linux-4c

- image: dist-loongarch64-linux
<<: *job-linux-4c-largedisk
<<: *job-linux-4c

- image: dist-loongarch64-musl
<<: *job-linux-4c-largedisk
<<: *job-linux-4c

- image: dist-ohos
<<: *job-linux-4c

- image: dist-powerpc-linux
<<: *job-linux-4c-largedisk
<<: *job-linux-4c

- image: dist-powerpc64-linux
<<: *job-linux-4c-largedisk
<<: *job-linux-4c

- image: dist-powerpc64le-linux
<<: *job-linux-4c-largedisk
<<: *job-linux-4c

- image: dist-riscv64-linux
<<: *job-linux-4c

- image: dist-s390x-linux
<<: *job-linux-4c-largedisk
<<: *job-linux-4c

- image: dist-various-1
<<: *job-linux-4c
Expand Down

0 comments on commit 0078e64

Please sign in to comment.