Skip to content

Commit 0465a5e

Browse files
authored
[ci] fix new test-build-dir job (#3170)
Pass in -Z build-dir-new-layout, and drop the now-stabilized build-dir feature env var.
1 parent 36d5c73 commit 0465a5e

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,27 +331,27 @@ jobs:
331331
- uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2
332332
- name: Build cargo-nextest
333333
run: cargo build --package cargo-nextest
334+
# build.build-dir was stabilized in Cargo 1.91. The new layout is
335+
# still nightly-only (-Zbuild-dir-new-layout).
334336
- name: Run fixture tests with build-dir
335337
env:
336338
CARGO_NEXTEST: target/debug/cargo-nextest
337339
RUSTUP_AVAILABLE: 1
338-
CARGO_UNSTABLE_BUILD_DIR: true
339-
CARGO_UNSTABLE_BUILD_DIR_NEW_LAYOUT: true
340340
CARGO_BUILD_BUILD_DIR: ${{ github.workspace }}/build-output
341341
run: |
342342
./scripts/nextest-without-rustup.sh run \
343+
-Z build-dir-new-layout \
343344
--manifest-path fixtures/nextest-tests/Cargo.toml \
344345
--package cdylib-link --package cdylib-example \
345346
--package with-build-script
346347
- name: Archive fixture tests with build-dir
347348
env:
348349
CARGO_NEXTEST: target/debug/cargo-nextest
349350
RUSTUP_AVAILABLE: 1
350-
CARGO_UNSTABLE_BUILD_DIR: true
351-
CARGO_UNSTABLE_BUILD_DIR_NEW_LAYOUT: true
352351
CARGO_BUILD_BUILD_DIR: ${{ github.workspace }}/build-output
353352
run: |
354353
./scripts/nextest-without-rustup.sh archive \
354+
-Z build-dir-new-layout \
355355
--manifest-path fixtures/nextest-tests/Cargo.toml \
356356
--archive-file target/build-dir-archive.tar.zst \
357357
--package cdylib-link --package cdylib-example \

0 commit comments

Comments
 (0)