Skip to content

Commit d2b7936

Browse files
committed
maint/CICD ~ add work-around for absorption of cargo tree into cargo
- see [GH:rust-lang/cargo#8062](rust-lang/cargo#8062) for more information
1 parent 4382b87 commit d2b7936

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/CICD.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,11 +103,11 @@ jobs:
103103
rustup show active-toolchain
104104
cargo -V
105105
rustc -V
106-
cargo tree -V
106+
cargo-tree tree -V
107107
## dependencies
108108
echo "## dependency list"
109109
cargo +stable fetch --quiet
110-
cargo +stable tree --all --no-dev-dependencies --no-indent --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique
110+
cargo-tree +stable tree --all --no-dev-dependencies --no-indent --features ${{ matrix.job.features }} | grep -vE "$PWD" | sort --unique
111111
- name: Test
112112
uses: actions-rs/cargo@v1
113113
with:
@@ -131,7 +131,7 @@ jobs:
131131
- { os: macos-latest , target: x86_64-apple-darwin , features: feat_os_unix }
132132
- { os: windows-latest , target: i686-pc-windows-gnu , features: feat_os_windows }
133133
- { os: windows-latest , target: i686-pc-windows-msvc , features: feat_os_windows }
134-
# - { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows , toolchain: nightly-x86_64-pc-windows-gnu } ## !maint: [rivy; due 2020-21-03] disable/remove when rust beta >= v1.43.0 is available (~mid-March)
134+
- { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows , toolchain: nightly-x86_64-pc-windows-gnu } ## !maint: [rivy; due 2020-21-03] disable/remove when rust beta >= v1.43.0 is available (~mid-March)
135135
- { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows , toolchain: beta-x86_64-pc-windows-gnu } ## maint: [rivy; due 2020-21-03; due 2020-01-05] enable when rust beta >= v1.43.0 is available (~mid-March); disable when rust stable >= 1.43.0 is available (~early-May)
136136
# - { os: windows-latest , target: x86_64-pc-windows-gnu , features: feat_os_windows } ## note: requires rust >= 1.43.0 to link correctly # ! maint: [rivy; due 2020-01-05] enable when rust stable >= 1.43.0 is available
137137
- { os: windows-latest , target: x86_64-pc-windows-msvc , features: feat_os_windows }
@@ -265,11 +265,11 @@ jobs:
265265
rustup show active-toolchain
266266
cargo -V
267267
rustc -V
268-
cargo tree -V
268+
cargo-tree tree -V
269269
## dependencies
270270
echo "## dependency list"
271271
cargo fetch --quiet
272-
cargo tree --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} --all --no-dev-dependencies --no-indent | grep -vE "$PWD" | sort --unique
272+
cargo-tree tree --target=${{ matrix.job.target }} ${{ matrix.job.cargo-options }} ${{ steps.vars.outputs.CARGO_FEATURES_OPTION }} --all --no-dev-dependencies --no-indent | grep -vE "$PWD" | sort --unique
273273
- name: Build
274274
uses: actions-rs/cargo@v1
275275
with:

0 commit comments

Comments
 (0)