Skip to content

Split test CI job into test and test-journey #1674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- name: Setup dependencies
run: sudo apt-get install -y --no-install-recommends liblzma-dev tree
run: sudo apt-get install -y --no-install-recommends liblzma-dev
- uses: extractions/setup-just@v2
- uses: taiki-e/install-action@v2
with:
Expand All @@ -75,6 +75,17 @@ jobs:
GIX_TEST_IGNORE_ARCHIVES: '1'
run: just ci-test

test-journey:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
- uses: Swatinem/rust-cache@v2
- uses: extractions/setup-just@v2
- name: Run journey tests
run: just ci-journey-tests

test-fast:
strategy:
matrix:
Expand All @@ -91,8 +102,8 @@ jobs:
- uses: Swatinem/rust-cache@v2
- name: Setup dependencies (macos)
if: startsWith(matrix.os, 'macos')
run: brew install tree openssl gnu-sed
- name: "cargo check default features"
run: brew install openssl gnu-sed
- name: cargo check default features
if: startsWith(matrix.os, 'windows')
run: cargo check --workspace --bins --examples
- uses: taiki-e/install-action@v2
Expand Down Expand Up @@ -342,6 +353,7 @@ jobs:
needs:
- pure-rust-build
- test
- test-journey
- test-fast
- test-32bit
- lint
Expand Down
11 changes: 8 additions & 3 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,15 @@ alias nt := nextest
# run all tests, clippy, including journey tests, try building docs
test: clippy check doc unit-tests journey-tests-pure journey-tests-small journey-tests-async journey-tests

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

# run all journey tests, but assure these are running after `cargo clean` (and workaround a just-issue of deduplicating targets)
# run all tests, without clippy, and try building docs (without clearing the target)
ci-test: check doc unit-tests

# run all journey tests
# these should be run in a fresh clone or after `cargo clean`
# (and workaround a just-issue of deduplicating targets)
ci-journey-tests: journey-tests-pure journey-tests-small journey-tests-async journey-tests

clear-target:
Expand Down
2 changes: 1 addition & 1 deletion tests/journey/ein.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ title "Porcelain ${kind}"
)
)
snapshot="$snapshot/porcelain"
(with_program tree
(with_program find
(when "using the 'tool' subcommand"
title "ein tool"
(with "a repo with a tiny commit history"
Expand Down
Loading