Skip to content

Commit a25754c

Browse files
authored
Merge pull request #1101 from waych/more_tests
Expand bundled testing to linux and macos
2 parents 2f7ec3a + 36a1291 commit a25754c

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

.github/workflows/CI.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,15 @@ jobs:
3131
cargo build --examples --features "${CI_BUILD_FEATURES}"
3232
cargo test --features "${CI_BUILD_FEATURES}"
3333
34-
build-windows:
35-
name: build windows bundled
36-
runs-on: windows-latest
34+
build-bundled:
35+
name: build bundled
36+
runs-on: ${{ matrix.os }}
3737
strategy:
3838
fail-fast: false
3939
matrix:
4040
feature: ["", "static-link"]
4141
build_mode: ["", "--release"]
42+
os: [macos-latest, ubuntu-latest, windows-latest]
4243
steps:
4344
- uses: actions/checkout@v2
4445
- name: Build SDL2
@@ -56,12 +57,10 @@ jobs:
5657
cargo test --features "${CI_BUILD_FEATURES} ${{matrix.feature}}" ${{matrix.build_mode}}
5758
5859
build-linux:
59-
name: build linux
60+
name: build linux pkg-config
6061
runs-on: ubuntu-20.04
6162
strategy:
6263
fail-fast: false
63-
matrix:
64-
feature: ["", "bundled"]
6564
steps:
6665
- uses: actions/checkout@v2
6766
- name: Install dependencies
@@ -77,6 +76,6 @@ jobs:
7776
set -xeuo pipefail
7877
rustc --version
7978
cargo --version
80-
cargo build --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
81-
cargo build --examples --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
82-
cargo test --features "${CI_BUILD_FEATURES},${{matrix.feature}}"
79+
cargo build --features "${CI_BUILD_FEATURES}"
80+
cargo build --examples --features "${CI_BUILD_FEATURES}"
81+
cargo test --features "${CI_BUILD_FEATURES}"

0 commit comments

Comments
 (0)