diff --git a/.github/workflows/local-development-makefile.yaml b/.github/workflows/local-development-makefile.yaml index ee14de84..d323bfe8 100644 --- a/.github/workflows/local-development-makefile.yaml +++ b/.github/workflows/local-development-makefile.yaml @@ -19,10 +19,9 @@ jobs: wdk: - Microsoft.WindowsWDK.10.0.22621 # NI WDK - rust_toolchain: - - stable - - beta - - nightly + target_triple: + - x86_64-pc-windows-msvc + - aarch64-pc-windows-msvc steps: - name: Checkout Repository @@ -39,10 +38,9 @@ jobs: winget install --disable-interactivity --source winget --exact --id ${{ matrix.wdk }} } - - name: Install Rust Toolchain (${{ matrix.rust_toolchain }}) - uses: dtolnay/rust-toolchain@master + - name: Install Rust Toolchain (${{ matrix.target_triple }}) + uses: dtolnay/rust-toolchain@stable # Use stable since local makefile pins toolchain versions anyways with: - toolchain: ${{ matrix.rust_toolchain }} targets: ${{ matrix.target_triple }} - name: Install Cargo Make diff --git a/Makefile.toml b/Makefile.toml index 5eb89545..562b95c5 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -8,7 +8,7 @@ additional_profiles = ["all-default-tasks"] CARGO_MAKE_SKIP_SLOW_SECONDARY_FLOWS = false CARGO_MAKE_CLIPPY_ARGS = "--all-targets -- -D warnings" RUSTFLAGS = "-D warnings" -ORIGINAL_CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN = "${CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN}" +CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN = "stable" [tasks.wdk-pre-commit-flow] description = "Run pre-commit tasks and checks" @@ -89,7 +89,7 @@ env = { CARGO_MAKE_CLIPPY_ARGS = "--features nightly ${CARGO_MAKE_CLIPPY_ARGS}", [tasks.post-nightly-clippy] extend = "post-clippy" -env = { CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN = "${ORIGINAL_CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN}" } +env = { CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN = "${CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN}" } [tasks.nightly-docs] extend = "docs" @@ -125,7 +125,7 @@ env = { CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN = "beta" } [tasks.post-beta-clippy] extend = "post-clippy" -env = { CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN = "${ORIGINAL_CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN}" } +env = { CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN = "${CARGO_MAKE_RUST_DEFAULT_TOOLCHAIN}" } [tasks.beta-docs] extend = "docs"