Skip to content

ci: add opt out env variable to temporarily prevent using build-dir v2 in nightly runs #707

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.

Sign up for GitHub

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
Alan632 merged 7 commits into from
Aug 4, 2026
Merged

ci: add opt out env variable to temporarily prevent using build-dir v2 in nightly runs #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9a556d3
- add opt out env var to prevent using build-dir v2 in nightly
Jul 31, 2026
a9dd803
Merge branch 'main' into mitigate-cargo-build_dir_v2
Alan632 Jul 31, 2026
7faf928
Change to using the public config override for build-dir opt out
Alan632 Aug 3, 2026
4160254
update env variable in test.yaml to use the public override
Alan632 Aug 3, 2026
f68eb7b
link gh issue in TODO comment
Alan632 Aug 3, 2026
314fe58
linkgh issue in test.yaml TODO comment
Alan632 Aug 3, 2026
1c34c7e
- add an exception for the build-dir v2 public override env var in th…
Aug 3, 2026
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
2 changes: 2 additions & 0 deletions .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ concurrency:
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

env:
# TODO: Remove when cargo-wdk supports Cargo build-dir layout v2 (see https://github.com/microsoft/windows-drivers-rs/issues/709).
CARGO_UNSTABLE_BUILD_DIR_NEW_LAYOUT: 'false'
RUSTFLAGS: >-
-D warnings
-C target-feature=+crt-static
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ concurrency:
group: ${{ github.workflow }}-${{ github.event.compare || github.head_ref || github.ref }}
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}

env:
# TODO: Remove when cargo-wdk supports Cargo build-dir layout v2 (see https://github.com/microsoft/windows-drivers-rs/issues/709).
# The whitelist in function `sanitize_env_vars` in crates/cargo-wdk/tests/test_utils/mod.rs should also be removed once this env var is removed.
CARGO_UNSTABLE_BUILD_DIR_NEW_LAYOUT: 'false'

jobs:
test:
name: Test
Expand Down
2 changes: 2 additions & 0 deletions crates/cargo-wdk/tests/test_utils/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,8 @@ fn sanitize_env_vars(cmd: &mut Command) {
// non-default locations
&& var_upper != "CARGO_HOME"
&& var_upper != "RUSTUP_HOME"
// TODO: Remove this whitelist once the env var is removed from test.yaml (see https://github.com/microsoft/windows-drivers-rs/issues/709)
&& var_upper != "CARGO_UNSTABLE_BUILD_DIR_NEW_LAYOUT"
{
Some(var)
} else {
Expand Down
Loading