Skip to content

Commit 711c2f5

Browse files
committed
Split journey tests out into their own CI job
In the `justfile`, this renames the old `ci-test` recipe to `ci-test-full`, and has `ci-test` no longer clean the target directory nor run journey tests. The CI `test` job thus remains the same, but it does moderately less work. A new CI job, `test-journey`, is introduced to run the journey tests (still via `ci-test-journey` recipe). This change is intended to allow greater parallelism, and possibly make caches work better. The CI `test` job has sometimes been a few minutes slower than before, ever since 5173e9a (#1668). See comments in #1668 for some discussion on this change.
1 parent f1a171b commit 711c2f5

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed

.github/workflows/ci.yml

+12
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,17 @@ jobs:
7575
GIX_TEST_IGNORE_ARCHIVES: '1'
7676
run: just ci-test
7777

78+
test-journey:
79+
runs-on: ubuntu-latest
80+
81+
steps:
82+
- uses: actions/checkout@v4
83+
- uses: dtolnay/rust-toolchain@stable
84+
- uses: Swatinem/rust-cache@v2
85+
- uses: extractions/setup-just@v2
86+
- name: Run journey tests
87+
run: just ci-journey-tests
88+
7889
test-fast:
7990
strategy:
8091
matrix:
@@ -342,6 +353,7 @@ jobs:
342353
needs:
343354
- pure-rust-build
344355
- test
356+
- test-journey
345357
- test-fast
346358
- test-32bit
347359
- lint

justfile

+8-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,15 @@ alias nt := nextest
1212
# run all tests, clippy, including journey tests, try building docs
1313
test: clippy check doc unit-tests journey-tests-pure journey-tests-small journey-tests-async journey-tests
1414

15-
# run all tests, without clippy, including journey tests, try building docs (and clear target on CI)
16-
ci-test: check doc unit-tests clear-target ci-journey-tests
15+
# run all tests, without clippy, including journey tests, try building docs (and clear target)
16+
ci-test-full: check doc unit-tests clear-target ci-journey-tests
1717

18-
# run all journey tests, but assure these are running after `cargo clean` (and workaround a just-issue of deduplicating targets)
18+
# run all tests, without clippy, and try building docs (without clearing the target)
19+
ci-test: check doc unit-tests
20+
21+
# run all journey tests
22+
# these should be run in a fresh clone or after `cargo clean`
23+
# (and workaround a just-issue of deduplicating targets)
1924
ci-journey-tests: journey-tests-pure journey-tests-small journey-tests-async journey-tests
2025

2126
clear-target:

0 commit comments

Comments
 (0)