Skip to content

Commit f7c76b3

Browse files
committed
chore: remove redundant macos dependency step, fixup test matrix conditions
1 parent 6b28149 commit f7c76b3

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

.github/workflows/test.yaml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,30 +42,24 @@ jobs:
4242

4343
- name: Install cross
4444
if: matrix.target.cross
45-
run: |
46-
cargo install cross --git https://github.com/cross-rs/cross
47-
48-
- name: Install macOS dependencies
49-
if: matrix.target.os == 'macos-latest'
50-
run: |
51-
brew install pkg-config openssl@3
45+
run: cargo install cross --git https://github.com/cross-rs/cross
5246

5347
- name: Build project (native)
54-
if: ${{ !matrix.target.cross }} # default to false if not set
48+
if: ${{ !matrix.target.cross }}
5549
run: cargo build --target ${{ matrix.target.target }} --features ${{ matrix.feature }}
5650

5751
- name: Build project (cross-compilation)
5852
if: matrix.target.cross
5953
run: cross build --release --target=${{ matrix.target.target }} --features ${{ matrix.feature }},vendored-openssl
6054

6155
- name: Install nextest
62-
if: ${{ !matrix.target.cross }} # default to false if not set
56+
if: ${{ matrix.target.test != false }}
6357
uses: taiki-e/install-action@nextest
6458

6559
- name: Run tests (native)
66-
if: (matrix.target.cross != true) && (matrix.target.test != false)
60+
if: ${{ matrix.target.test != false && !matrix.target.cross }}
6761
run: cargo nextest run --verbose --features ${{ matrix.feature }} --target ${{ matrix.target.target }}
6862

6963
- name: Run tests (cross-compiled)
70-
if: matrix.target.cross && (matrix.target.test != false)
71-
run: cargo nextest run --verbose --features ${{ matrix.feature }} --target ${{ matrix.target.target }}
64+
if: ${{ matrix.target.test != false && matrix.target.cross }}
65+
run: cross test --verbose --features ${{ matrix.feature }} --target ${{ matrix.target.target }}

0 commit comments

Comments
 (0)