From 960d88ca9ca12056f1c19b3006cf1a0c1214233c Mon Sep 17 00:00:00 2001 From: Mike Waychison Date: Fri, 23 Apr 2021 08:50:29 -0700 Subject: [PATCH] Expand bundled testing to linux and macos --- .github/workflows/CI.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 59175211588..732feff75a7 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -33,12 +33,13 @@ jobs: build-windows: name: build windows bundled - runs-on: windows-latest + runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: feature: ["", "static-link"] build_mode: ["", "--release"] + os: [macos-latest, ubuntu-latest, windows-latest] steps: - uses: actions/checkout@v2 - name: Build SDL2 @@ -56,12 +57,10 @@ jobs: cargo test --features "${CI_BUILD_FEATURES} ${{matrix.feature}}" ${{matrix.build_mode}} build-linux: - name: build linux + name: build linux pkg-config runs-on: ubuntu-20.04 strategy: fail-fast: false - matrix: - feature: ["", "bundled"] steps: - uses: actions/checkout@v2 - name: Install dependencies @@ -77,6 +76,6 @@ jobs: set -xeuo pipefail rustc --version cargo --version - cargo build --features "${CI_BUILD_FEATURES},${{matrix.feature}}" - cargo build --examples --features "${CI_BUILD_FEATURES},${{matrix.feature}}" - cargo test --features "${CI_BUILD_FEATURES},${{matrix.feature}}" + cargo build --features "${CI_BUILD_FEATURES}" + cargo build --examples --features "${CI_BUILD_FEATURES}" + cargo test --features "${CI_BUILD_FEATURES}"