From 33c238f0f77bcb6b14929d3f040d707930d762ff Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Wed, 4 Mar 2026 15:39:49 +0000 Subject: [PATCH 1/7] Also run tests for the i686-pc-windows-msvc target --- .github/workflows/windows.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index a85ed74..6d4ebc3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -22,10 +22,14 @@ jobs: toolchain: ${{ matrix.toolchain }} profile: minimal override: true - targets: "wasm32-unknown-unknown" + targets: "wasm32-unknown-unknown,i686-pc-windows-msvc" - name: "Test on the native x86_64-pc-windows-mscv" run: cargo test --all-features --workspace - name: "Test when cross-compiling to x86_64-pc-windows-gnu" env: AUDITABLE_TEST_TARGET: "x86_64-pc-windows-gnu" run: cargo test --all-features --workspace + - name: "Test when cross-compiling to i686-pc-windows-msvc" + env: + AUDITABLE_TEST_TARGET: "i686-pc-windows-msvc" + run: cargo test --all-features --workspace From a3143cd3303752ca98600b8e585acb30311617e0 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Wed, 4 Mar 2026 16:10:33 +0000 Subject: [PATCH 2/7] Make bare linker test also configure a bare linker on i686-pc-windows-msvc --- .../tests/fixtures/bare_linker/.cargo/config.toml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml b/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml index 1287e6b..debb6d2 100644 --- a/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml +++ b/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml @@ -31,3 +31,9 @@ rustflags = ["-C", "target-feature=+crt-static"] [target.x86_64-unknown-linux-musl] linker = "rust-lld" rustflags = ["-C", "target-feature=+crt-static"] + +# Not included in the original Rayhunter example, this tests for +# https://github.com/rust-lang/rust/issues/96498 + +[target.i686-pc-windows-msvc] +linker = "rust-lld" \ No newline at end of file From 959563f2e4872aa1401985d9e05bfe0cbfa89257 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Wed, 4 Mar 2026 17:23:18 +0000 Subject: [PATCH 3/7] Enable bare linker for all Windows targets --- cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml b/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml index debb6d2..4d5201b 100644 --- a/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml +++ b/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml @@ -35,5 +35,5 @@ rustflags = ["-C", "target-feature=+crt-static"] # Not included in the original Rayhunter example, this tests for # https://github.com/rust-lang/rust/issues/96498 -[target.i686-pc-windows-msvc] -linker = "rust-lld" \ No newline at end of file +[target.'cfg(windows)'] +linker = "rust-lld" From f88028e8a898245e241c4ad949f8ec0c6f4cf2b3 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Wed, 4 Mar 2026 17:37:21 +0000 Subject: [PATCH 4/7] Drop bare linker tests from Windows for now --- .../tests/fixtures/bare_linker/.cargo/config.toml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml b/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml index 4d5201b..b7511fc 100644 --- a/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml +++ b/cargo-auditable/tests/fixtures/bare_linker/.cargo/config.toml @@ -32,8 +32,3 @@ rustflags = ["-C", "target-feature=+crt-static"] linker = "rust-lld" rustflags = ["-C", "target-feature=+crt-static"] -# Not included in the original Rayhunter example, this tests for -# https://github.com/rust-lang/rust/issues/96498 - -[target.'cfg(windows)'] -linker = "rust-lld" From 7730fc36062b80462f31b703b85d8b506912c6de Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Wed, 4 Mar 2026 17:38:40 +0000 Subject: [PATCH 5/7] Split Windows job into three --- .github/workflows/windows.yml | 38 +++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 6d4ebc3..b26bb42 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,29 +6,45 @@ on: branches: master jobs: - test: - strategy: - matrix: - platform: - - windows-latest - toolchain: - - stable - runs-on: ${{ matrix.platform }} + test-native: + runs-on: windows-latest steps: - uses: actions/checkout@v2 - uses: swatinem/rust-cache@v2 - uses: dtolnay/rust-toolchain@stable with: - toolchain: ${{ matrix.toolchain }} + toolchain: stable profile: minimal override: true - targets: "wasm32-unknown-unknown,i686-pc-windows-msvc" - - name: "Test on the native x86_64-pc-windows-mscv" + - name: "Test on the native x86_64-pc-windows-msvc" run: cargo test --all-features --workspace + + test-cross-gnu: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - uses: swatinem/rust-cache@v2 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: stable + profile: minimal + override: true - name: "Test when cross-compiling to x86_64-pc-windows-gnu" env: AUDITABLE_TEST_TARGET: "x86_64-pc-windows-gnu" run: cargo test --all-features --workspace + + test-cross-i686-msvc: + runs-on: windows-latest + steps: + - uses: actions/checkout@v2 + - uses: swatinem/rust-cache@v2 + - uses: dtolnay/rust-toolchain@stable + with: + toolchain: stable + profile: minimal + override: true + targets: "i686-pc-windows-msvc" - name: "Test when cross-compiling to i686-pc-windows-msvc" env: AUDITABLE_TEST_TARGET: "i686-pc-windows-msvc" From 2dddbcf7f7da1f55c732618a19e29b45f5f76801 Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Wed, 4 Mar 2026 17:43:41 +0000 Subject: [PATCH 6/7] Clearer job naming --- .github/workflows/windows.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b26bb42..b4cf101 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -6,7 +6,7 @@ on: branches: master jobs: - test-native: + test-x86_64-pc-windows-msvc: runs-on: windows-latest steps: - uses: actions/checkout@v2 @@ -19,7 +19,7 @@ jobs: - name: "Test on the native x86_64-pc-windows-msvc" run: cargo test --all-features --workspace - test-cross-gnu: + test-x86_64-pc-windows-gnu: runs-on: windows-latest steps: - uses: actions/checkout@v2 @@ -34,7 +34,7 @@ jobs: AUDITABLE_TEST_TARGET: "x86_64-pc-windows-gnu" run: cargo test --all-features --workspace - test-cross-i686-msvc: + test-i686-pc-windows-msvc: runs-on: windows-latest steps: - uses: actions/checkout@v2 From 8efadbab9e6790b4efa286b44f6680fb9ab9220f Mon Sep 17 00:00:00 2001 From: "Sergey \"Shnatsel\" Davidoff" Date: Wed, 4 Mar 2026 17:43:55 +0000 Subject: [PATCH 7/7] re-add the lost wasm target --- .github/workflows/windows.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index b4cf101..e26a2a6 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -16,6 +16,7 @@ jobs: toolchain: stable profile: minimal override: true + targets: "wasm32-unknown-unknown" - name: "Test on the native x86_64-pc-windows-msvc" run: cargo test --all-features --workspace @@ -29,6 +30,7 @@ jobs: toolchain: stable profile: minimal override: true + targets: "wasm32-unknown-unknown" - name: "Test when cross-compiling to x86_64-pc-windows-gnu" env: AUDITABLE_TEST_TARGET: "x86_64-pc-windows-gnu" @@ -44,7 +46,7 @@ jobs: toolchain: stable profile: minimal override: true - targets: "i686-pc-windows-msvc" + targets: "wasm32-unknown-unknown,i686-pc-windows-msvc" - name: "Test when cross-compiling to i686-pc-windows-msvc" env: AUDITABLE_TEST_TARGET: "i686-pc-windows-msvc"