Skip to content

Commit

Permalink
Auto merge of #11848 - weihanglo:rmrf, r=epage
Browse files Browse the repository at this point in the history
ci: make clean-test-output a script for reuse
  • Loading branch information
bors committed Mar 14, 2023
2 parents 9282cf7 + 6712c51 commit 4a3c588
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 14 deletions.
17 changes: 3 additions & 14 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,21 +103,15 @@ jobs:

- run: cargo test
- name: Clear intermediate test output
run: |
df -h
rm -rf target/tmp
df -h
run: ci/clean-test-output.sh
- name: gitoxide tests (all git-related tests)
run: cargo test git
env:
__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2: 1
# The testsuite generates a huge amount of data, and fetch-smoke-test was
# running out of disk space.
- name: Clear test output
run: |
df -h
rm -rf target/tmp
df -h
run: ci/clean-test-output.sh
- name: Check operability of rustc invocation with argfile
env:
__CARGO_TEST_FORCE_ARGFILE: 1
Expand Down Expand Up @@ -151,10 +145,7 @@ jobs:
# The testsuite generates a huge amount of data, and fetch-smoke-test was
# running out of disk space.
- name: Clear benchmark output
run: |
df -h
rm -rf target/tmp
df -h
run: ci/clean-test-output.sh
- name: Fetch smoke test
run: ci/fetch-smoke-test.sh

Expand All @@ -179,8 +170,6 @@ jobs:

build_std:
runs-on: ubuntu-latest
env:
CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse
steps:
- uses: actions/checkout@v3
- run: rustup update nightly && rustup default nightly
Expand Down
8 changes: 8 additions & 0 deletions ci/clean-test-output.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
# This script remove test and benchmark output and displays disk usage.

set -euo pipefail

df -h
rm -rf target/tmp
df -h

0 comments on commit 4a3c588

Please sign in to comment.