Skip to content

Commit 275d7d1

Browse files
authored
Merge pull request #243 from rust-secure-code/i686-msvc-tests
Also run CI tests for the i686-pc-windows-msvc target
2 parents e7e15de + 8efadba commit 275d7d1

File tree

2 files changed

+33
-10
lines changed

2 files changed

+33
-10
lines changed

.github/workflows/windows.yml

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,48 @@ on:
66
branches: master
77

88
jobs:
9-
test:
10-
strategy:
11-
matrix:
12-
platform:
13-
- windows-latest
14-
toolchain:
15-
- stable
16-
runs-on: ${{ matrix.platform }}
9+
test-x86_64-pc-windows-msvc:
10+
runs-on: windows-latest
1711
steps:
1812
- uses: actions/checkout@v2
1913
- uses: swatinem/rust-cache@v2
2014
- uses: dtolnay/rust-toolchain@stable
2115
with:
22-
toolchain: ${{ matrix.toolchain }}
16+
toolchain: stable
2317
profile: minimal
2418
override: true
2519
targets: "wasm32-unknown-unknown"
26-
- name: "Test on the native x86_64-pc-windows-mscv"
20+
- name: "Test on the native x86_64-pc-windows-msvc"
2721
run: cargo test --all-features --workspace
22+
23+
test-x86_64-pc-windows-gnu:
24+
runs-on: windows-latest
25+
steps:
26+
- uses: actions/checkout@v2
27+
- uses: swatinem/rust-cache@v2
28+
- uses: dtolnay/rust-toolchain@stable
29+
with:
30+
toolchain: stable
31+
profile: minimal
32+
override: true
33+
targets: "wasm32-unknown-unknown"
2834
- name: "Test when cross-compiling to x86_64-pc-windows-gnu"
2935
env:
3036
AUDITABLE_TEST_TARGET: "x86_64-pc-windows-gnu"
3137
run: cargo test --all-features --workspace
38+
39+
test-i686-pc-windows-msvc:
40+
runs-on: windows-latest
41+
steps:
42+
- uses: actions/checkout@v2
43+
- uses: swatinem/rust-cache@v2
44+
- uses: dtolnay/rust-toolchain@stable
45+
with:
46+
toolchain: stable
47+
profile: minimal
48+
override: true
49+
targets: "wasm32-unknown-unknown,i686-pc-windows-msvc"
50+
- name: "Test when cross-compiling to i686-pc-windows-msvc"
51+
env:
52+
AUDITABLE_TEST_TARGET: "i686-pc-windows-msvc"
53+
run: cargo test --all-features --workspace

cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,4 @@ rustflags = ["-C", "target-feature=+crt-static"]
3131
[target.x86_64-unknown-linux-musl]
3232
linker = "rust-lld"
3333
rustflags = ["-C", "target-feature=+crt-static"]
34+

0 commit comments

Comments
 (0)