Skip to content

Commit

Permalink
remove free_some_disk boolean
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcoIeni committed Nov 4, 2024
1 parent ea9be1f commit b9a27fc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,16 +108,9 @@ jobs:
# we do not need. We do this to enable some of the less resource
# intensive jobs to run on free runners, which however also have
# less disk space.
- name: free up some disk space
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
if: contains(matrix.free_some_disk, true)
with:
# Removing packages with APT saves ~5 GiB, but takes several
# minutes (and potentially removes important packages).
large-packages: false
- name: free up disk space
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
if: contains(matrix.free_disk, true)
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
10 changes: 4 additions & 6 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,12 @@ runners:
- &job-linux-4c
os: ubuntu-20.04
# Free some disk space to avoid running out of space during the build.
free_some_disk: true
free_disk: true
<<: *base-job

# Large runner used mainly for its bigger disk capacity
- &job-linux-4c-largedisk
os: ubuntu-20.04
# Free as much disk space as possible to avoid running out of space during the build.
# Only set this if `free_some_disk` is not enough because freeing disk takes time.
free_disk: true
os: ubuntu-20.04-4core-16gb
<<: *base-job

- &job-linux-8c
Expand Down Expand Up @@ -163,7 +161,7 @@ auto:
<<: *job-linux-4c-largedisk

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

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

0 comments on commit b9a27fc

Please sign in to comment.