Skip to content

Commit

Permalink
CI: Check symbol prefixes on Windows too.
Browse files Browse the repository at this point in the history
  • Loading branch information
briansmith committed Jan 14, 2024
1 parent 3cb66f5 commit f78a796
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,12 @@ jobs:
cargo +${{ matrix.rust_channel }} test -vv --target=${{ matrix.target }} ${{ matrix.cargo_options }} ${{ matrix.features }} ${{ matrix.mode }}
# Check that all the needed symbol renaming was done.
# TODO: Do this check on Windows too.

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

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

test-bench:
Expand Down Expand Up @@ -412,14 +410,12 @@ jobs:
mk/cargo.sh +${{ matrix.rust_channel }} test -vv --doc --target=${{ matrix.target }} ${{ matrix.cargo_options }} ${{ matrix.features }} ${{ matrix.mode }}
# Check that all the needed symbol renaming was done.
# TODO: Do this check on Windows too.

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

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

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

Expand Down

0 comments on commit f78a796

Please sign in to comment.