Skip to content

Commit acfdb8d

Browse files
committedOct 18, 2024
Auto merge of rust-lang#131362 - Kobzol:ci-free-runners-linux-4c, r=Mark-Simulacrum
CI: use free runners for 4-core Linux jobs It looks like the [free runners](https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories) already have the same spec as the `4c` custom "large" runner (4 cores, 16 GiB of memory, Ubuntu 20.04). try-job: arm-android try-job: armhf-gnu try-job: dist-aarch64-linux try-job: dist-android try-job: dist-arm-linux try-job: dist-armhf-linux try-job: dist-armv7-linux try-job: dist-i586-gnu-i586-i686-musl try-job: dist-i686-linux try-job: dist-loongarch64-linux try-job: dist-loongarch64-musl try-job: dist-ohos try-job: dist-powerpc-linux try-job: dist-powerpc64-linux try-job: dist-powerpc64le-linux try-job: dist-riscv64-linux try-job: dist-s390x-linux try-job: dist-various-1 try-job: dist-various-2 try-job: dist-x86_64-freebsd try-job: dist-x86_64-illumos try-job: dist-x86_64-netbsd try-job: mingw-check try-job: test-various try-job: x86_64-gnu try-job: x86_64-gnu-stable try-job: x86_64-gnu-aux try-job: x86_64-gnu-debug try-job: x86_64-gnu-nopt
2 parents db8043b + 91c4d09 commit acfdb8d

File tree

2 files changed

+29
-7
lines changed

2 files changed

+29
-7
lines changed
 

‎.github/workflows/ci.yml

+17
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,18 @@ jobs:
104104
with:
105105
fetch-depth: 2
106106

107+
# Free up disk space on Linux by removing preinstalled components that
108+
# we do not need. We do this to enable some of the less resource
109+
# intensive jobs to run on free runners, which however also have
110+
# less disk space.
111+
- name: free up disk space
112+
uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be
113+
if: contains(matrix.os, 'ubuntu')
114+
with:
115+
# Removing packages with APT saves ~5 GiB, but takes several
116+
# minutes (and potentially removes important packages).
117+
large-packages: false
118+
107119
# Rust Log Analyzer can't currently detect the PR number of a GitHub
108120
# Actions build on its own, so a hint in the log message is needed to
109121
# point it in the right direction.
@@ -194,6 +206,11 @@ jobs:
194206
- name: create github artifacts
195207
run: src/ci/scripts/create-doc-artifacts.sh
196208

209+
- name: print disk usage
210+
run: |
211+
echo "disk usage:"
212+
df -h
213+
197214
- name: upload artifacts to github
198215
uses: actions/upload-artifact@v4
199216
with:

‎src/ci/github-actions/jobs.yml

+12-7
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ runners:
55
env: { }
66

77
- &job-linux-4c
8+
os: ubuntu-20.04
9+
<<: *base-job
10+
11+
# Large runner used mainly for its bigger disk capacity
12+
- &job-linux-4c-largedisk
813
os: ubuntu-20.04-4core-16gb
914
<<: *base-job
1015

@@ -127,7 +132,7 @@ auto:
127132
- image: dist-aarch64-linux
128133
env:
129134
CODEGEN_BACKENDS: llvm,cranelift
130-
<<: *job-linux-4c
135+
<<: *job-linux-4c-largedisk
131136

132137
- image: dist-android
133138
<<: *job-linux-4c
@@ -148,28 +153,28 @@ auto:
148153
<<: *job-linux-4c
149154

150155
- image: dist-loongarch64-linux
151-
<<: *job-linux-4c
156+
<<: *job-linux-4c-largedisk
152157

153158
- image: dist-loongarch64-musl
154-
<<: *job-linux-4c
159+
<<: *job-linux-4c-largedisk
155160

156161
- image: dist-ohos
157162
<<: *job-linux-4c
158163

159164
- image: dist-powerpc-linux
160-
<<: *job-linux-4c
165+
<<: *job-linux-4c-largedisk
161166

162167
- image: dist-powerpc64-linux
163-
<<: *job-linux-4c
168+
<<: *job-linux-4c-largedisk
164169

165170
- image: dist-powerpc64le-linux
166-
<<: *job-linux-4c
171+
<<: *job-linux-4c-largedisk
167172

168173
- image: dist-riscv64-linux
169174
<<: *job-linux-4c
170175

171176
- image: dist-s390x-linux
172-
<<: *job-linux-4c
177+
<<: *job-linux-4c-largedisk
173178

174179
- image: dist-various-1
175180
<<: *job-linux-4c

0 commit comments

Comments
 (0)