Skip to content

Commit 010bc3b

Browse files
committed
CI: Check symbol prefixes on Windows too.
1 parent 9593d9b commit 010bc3b

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -353,14 +353,12 @@ jobs:
353353
cargo +${{ matrix.rust_channel }} test -vv --target=${{ matrix.target }} ${{ matrix.cargo_options }} ${{ matrix.features }} ${{ matrix.mode }}
354354
355355
# Check that all the needed symbol renaming was done.
356-
# TODO: Do this check on Windows too.
357356

358-
- if: ${{ (matrix.target != 'aarch64-apple-ios' || matrix.rust_channel != '1.63.0') &&
359-
!contains(matrix.host_os, 'windows') }}
357+
- if: ${{ (matrix.target != 'aarch64-apple-ios' || matrix.rust_channel != '1.61.0') }}
360358
run: rustup toolchain install --component=llvm-tools-preview ${{ matrix.rust_channel }}
361359

362-
- if: ${{ (matrix.target != 'aarch64-apple-ios' || matrix.rust_channel != '1.63.0') &&
363-
!contains(matrix.host_os, 'windows') }}
360+
- if: ${{ (matrix.target != 'aarch64-apple-ios' || matrix.rust_channel != '1.61.0') }}
361+
shell: sh
364362
run: mk/check-symbol-prefixes.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}
365363

366364
test-bench:
@@ -483,14 +481,12 @@ jobs:
483481
mk/cargo.sh +${{ matrix.rust_channel }} test -vv --doc --target=${{ matrix.target }} ${{ matrix.cargo_options }} ${{ matrix.features }} ${{ matrix.mode }}
484482
485483
# Check that all the needed symbol renaming was done.
486-
# TODO: Do this check on Windows too.
487484

488-
- if: ${{ (matrix.target != 'aarch64-apple-ios' || matrix.rust_channel != '1.63.0') &&
489-
!contains(matrix.host_os, 'windows') }}
485+
- if: ${{ (matrix.target != 'aarch64-apple-ios' || matrix.rust_channel != '1.61.0') }}
490486
run: rustup toolchain install --component=llvm-tools-preview ${{ matrix.rust_channel }}
491487

492-
- if: ${{ (matrix.target != 'aarch64-apple-ios' || matrix.rust_channel != '1.63.0') &&
493-
!contains(matrix.host_os, 'windows') }}
488+
- if: ${{ (matrix.target != 'aarch64-apple-ios' || matrix.rust_channel != '1.61.0') }}
489+
shell: sh
494490
run: mk/check-symbol-prefixes.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}
495491

496492
# The wasm32-unknown-unknown targets have a different set of feature sets and
@@ -548,7 +544,6 @@ jobs:
548544
${{ matrix.webdriver }} mk/cargo.sh +${{ matrix.rust_channel }} test -vv --target=${{ matrix.target }} ${{ matrix.features }} ${{ matrix.mode }}
549545
550546
# Check that all the needed symbol renaming was done.
551-
# TODO: Do this check on Windows too.
552547
- run: rustup toolchain install --component=llvm-tools-preview ${{ matrix.rust_channel }}
553548
- run: mk/check-symbol-prefixes.sh +${{ matrix.rust_channel }} --target=${{ matrix.target }}
554549

0 commit comments

Comments
 (0)