Skip to content

Commit 0047915

Browse files
authored
Merge pull request #9917 from oech3/patch-3
openbsd.yml: Replace cargo cache related disk space hack
2 parents d348471 + e12fe01 commit 0047915

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

.github/workflows/openbsd.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
prepare: |
4848
# Clean up disk space before installing packages
4949
df -h
50-
rm -rf /usr/share/doc/* /usr/share/man/* /var/cache/* /tmp/* || true
50+
rm -rf /usr/share/relink/* /usr/X11R6/* /usr/share/doc/* /usr/share/man/* || :
5151
pkg_add curl sudo-- jq coreutils bash rust rust-clippy rust-rustfmt llvm--
5252
# Clean up package cache after installation
5353
pkg_delete -a || true
@@ -115,8 +115,6 @@ jobs:
115115
fi
116116
# Clean to avoid to rsync back the files and free up disk space
117117
cargo clean
118-
# Additional cleanup to free disk space
119-
rm -rf ~/.cargo/registry/cache ~/.cargo/git/db || true
120118
if [ -n "\${FAIL_ON_FAULT}" ] && [ -n "\${FAULT}" ]; then exit 1 ; fi
121119
EOF
122120
@@ -144,10 +142,10 @@ jobs:
144142
prepare: |
145143
# Clean up disk space before installing packages
146144
df -h
147-
rm -rf /usr/share/doc/* /usr/share/man/* /var/cache/* /tmp/* || true
145+
rm -rf /usr/share/relink/* /usr/X11R6/* /usr/share/doc/* /usr/share/man/* || :
148146
pkg_add curl gmake sudo-- jq rust llvm--
149147
# Clean up package cache after installation
150-
pkg_delete -a || true
148+
pkg_delete -a || :
151149
df -h
152150
run: |
153151
## Prepare, build, and test
@@ -197,8 +195,6 @@ jobs:
197195
cd "${WORKSPACE}"
198196
unset FAULT
199197
cargo build || FAULT=1
200-
# Clean build artifacts to save disk space before testing
201-
rm -rf target/debug/build target/debug/incremental || true
202198
export PATH=~/.cargo/bin:${PATH}
203199
export RUST_BACKTRACE=1
204200
export CARGO_TERM_COLOR=always
@@ -216,6 +212,5 @@ jobs:
216212
# Clean to avoid to rsync back the files and free up disk space
217213
cargo clean
218214
# Additional cleanup to free disk space
219-
rm -rf ~/.cargo/registry/cache ~/.cargo/git/db target/debug/deps target/release/deps || true
220215
if (test -n "\$FAULT"); then exit 1 ; fi
221216
EOF

0 commit comments

Comments
 (0)