Skip to content

Commit

Permalink
pin local makefile to run on stable
Browse files Browse the repository at this point in the history
  • Loading branch information
wmmc88 committed Apr 2, 2024
1 parent 6eb8334 commit 500c426
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/local-development-makefile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Makefile.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 500c426

Please sign in to comment.