Skip to content

Commit f83510a

Browse files
ci: add nuget support along with new WDK version
1 parent 238cd7e commit f83510a

3 files changed

Lines changed: 34 additions & 18 deletions

File tree

.github/workflows/build.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ jobs:
2525
arch: arm64
2626

2727
wdk:
28-
- 10.0.22621 # NI WDK
28+
- version: 10.0.22621 # NI WDK
29+
source: winget
30+
- version: 10.0.26100 # GE WDK
31+
source: nuget
2932

3033
llvm:
3134
- 17.0.6
@@ -79,11 +82,13 @@ jobs:
7982
with:
8083
version: ${{ matrix.llvm }}
8184

82-
- name: Install WDK (${{ matrix.wdk }})
85+
- name: Install WDK (${{ matrix.wdk.version }})
8386
uses: ./.github/actions/install-wdk
8487
with:
85-
version: ${{ matrix.wdk }}
86-
source: winget
88+
version: ${{ matrix.wdk.version }}
89+
source: ${{ matrix.wdk.source }}
90+
host: ${{ matrix.wdk.source == 'nuget' && matrix.runner.arch || '' }}
91+
target: ${{ matrix.wdk.source == 'nuget' && matrix.target_triple.arch || '' }}
8792

8893
- name: Install Rust Toolchain (${{ matrix.rust_toolchain }})
8994
uses: dtolnay/rust-toolchain@master

.github/workflows/docs.yaml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ jobs:
2323
arch: arm64
2424

2525
wdk:
26-
- 10.0.22621 # NI WDK
26+
- version: 10.0.22621 # NI WDK
27+
source: winget
28+
- version: 10.0.26100 # GE WDK
29+
source: nuget
2730

2831
llvm:
2932
- 17.0.6
@@ -77,11 +80,13 @@ jobs:
7780
with:
7881
version: ${{ matrix.llvm }}
7982

80-
- name: Install WDK (${{ matrix.wdk }})
83+
- name: Install WDK (${{ matrix.wdk.version }})
8184
uses: ./.github/actions/install-wdk
8285
with:
83-
version: ${{ matrix.wdk }}
84-
source: winget
86+
version: ${{ matrix.wdk.version }}
87+
source: ${{ matrix.wdk.source }}
88+
host: ${{ matrix.wdk.source == 'nuget' && matrix.runner.arch || '' }}
89+
target: ${{ matrix.wdk.source == 'nuget' && matrix.target_triple.arch || '' }}
8590

8691
- name: Install Rust Toolchain (${{ matrix.rust_toolchain }})
8792
uses: dtolnay/rust-toolchain@master

.github/workflows/lint.yaml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ jobs:
2323
arch: arm64
2424

2525
wdk:
26-
- 10.0.22621 # NI WDK
26+
- version: 10.0.22621 # NI WDK
27+
source: winget
28+
- version: 10.0.26100 # GE WDK
29+
source: nuget
2730

2831
llvm:
2932
- 17.0.6
@@ -38,8 +41,10 @@ jobs:
3841
- release
3942

4043
target_triple:
41-
- x86_64-pc-windows-msvc
42-
- aarch64-pc-windows-msvc
44+
- name: x86_64-pc-windows-msvc
45+
arch: amd64
46+
- name: aarch64-pc-windows-msvc
47+
arch: arm64
4348

4449
runs-on: ${{ matrix.runner.name }}
4550
steps:
@@ -74,26 +79,27 @@ jobs:
7479
with:
7580
version: ${{ matrix.llvm }}
7681

77-
- name: Install WDK (${{ matrix.wdk }})
82+
- name: Install WDK (${{ matrix.wdk.version }})
7883
uses: ./.github/actions/install-wdk
7984
with:
80-
version: ${{ matrix.wdk }}
81-
source: winget
85+
version: ${{ matrix.wdk.version }}
86+
source: ${{ matrix.wdk.source }}
87+
host: ${{ matrix.wdk.source == 'nuget' && matrix.runner.arch || '' }}
88+
target: ${{ matrix.wdk.source == 'nuget' && matrix.target_triple.arch || '' }}
8289

8390
- name: Install Rust Toolchain (${{ matrix.rust_toolchain }})
8491
uses: dtolnay/rust-toolchain@master
8592
with:
8693
toolchain: ${{ matrix.rust_toolchain }}
8794
components: clippy
88-
targets: ${{ matrix.target_triple }}
95+
targets: ${{ matrix.target_triple.name }}
8996

9097
- name: Run Cargo Clippy
91-
run: cargo +${{ matrix.rust_toolchain }} clippy --locked --profile ${{ matrix.cargo_profile }} --target ${{ matrix.target_triple }} --all-targets -- -D warnings
98+
run: cargo +${{ matrix.rust_toolchain }} clippy --locked --profile ${{ matrix.cargo_profile }} --target ${{ matrix.target_triple.name }} --all-targets -- -D warnings
9299

93100
- name: Run Cargo Clippy (--features nightly)
94101
if: matrix.rust_toolchain == 'nightly'
95-
run: cargo +${{ matrix.rust_toolchain }} clippy --locked --profile ${{ matrix.cargo_profile }} --target ${{ matrix.target_triple }} --all-targets --features nightly -- -D warnings
96-
102+
run: cargo +${{ matrix.rust_toolchain }} clippy --locked --profile ${{ matrix.cargo_profile }} --target ${{ matrix.target_triple.name }} --all-targets --features nightly -- -D warnings
97103
machete:
98104
name: Detect Unused Cargo Dependencies
99105
runs-on: windows-2025

0 commit comments

Comments
 (0)