Skip to content

Commit f1a171b

Browse files
committed
Update a journey test tree use delcaration to find
This also stops installing `tree` on CI. The `tree` package provides the `tree` command, which is useful but does not currently appear to be used anywhere. At one time, various journey tests had used it to generate output for comparison, and this usage/dependency was declared with `with_program` in 688280b, which was also when the first command to install it was added to CI. Later, `tree` was found to be unportable or otherwise unsuitable in the counts it output, and all uses of it were replaced with `find` in 3c1bfd5 (#861). At that point, most `with_program` declarations for it were changed to `find`, but one of them in the `ein` journey tests was not replaced at that time. That test does use `find` (and not `tree`), and should declare its use of `find` rather than `tree`. This commit makes that change. One benefit of doing so is that it is possible to run the tests on a CI (or other) system without `tree` without skipping any tests, so this also removes it from the lists of packages to install with `apt-get` and `brew` in CI jobs.
1 parent eedebe7 commit f1a171b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/ci.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
- uses: dtolnay/rust-toolchain@stable
6666
- uses: Swatinem/rust-cache@v2
6767
- name: Setup dependencies
68-
run: sudo apt-get install -y --no-install-recommends liblzma-dev tree
68+
run: sudo apt-get install -y --no-install-recommends liblzma-dev
6969
- uses: extractions/setup-just@v2
7070
- uses: taiki-e/install-action@v2
7171
with:
@@ -91,8 +91,8 @@ jobs:
9191
- uses: Swatinem/rust-cache@v2
9292
- name: Setup dependencies (macos)
9393
if: startsWith(matrix.os, 'macos')
94-
run: brew install tree openssl gnu-sed
95-
- name: "cargo check default features"
94+
run: brew install openssl gnu-sed
95+
- name: cargo check default features
9696
if: startsWith(matrix.os, 'windows')
9797
run: cargo check --workspace --bins --examples
9898
- uses: taiki-e/install-action@v2

tests/journey/ein.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ title "Porcelain ${kind}"
2828
)
2929
)
3030
snapshot="$snapshot/porcelain"
31-
(with_program tree
31+
(with_program find
3232
(when "using the 'tool' subcommand"
3333
title "ein tool"
3434
(with "a repo with a tiny commit history"

0 commit comments

Comments
 (0)