Skip to content

Commit

Permalink
Consolidate Windows and MacOS builds
Browse files Browse the repository at this point in the history
  • Loading branch information
richardapeters committed Sep 7, 2023
1 parent 6cb8158 commit d8a9f98
Showing 1 changed file with 1 addition and 34 deletions.
35 changes: 1 addition & 34 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,40 +52,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [windows-latest, windows-2019]
include:
- visual-studio: "2022"
os: "windows-latest"
- visual-studio: "2019"
os: "windows-2019"
steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
with:
persist-credentials: false
- uses: ilammy/msvc-dev-cmd@cec98b9d092141f74527d0afa6feb2af698cfe89 # v1.12.1
with:
vsversion: ${{ matrix.visual-studio }}
- uses: lukka/run-vcpkg@abed23940f9d7bc267b0e1a21ee7b699a3794baa # v11.1
with:
vcpkgGitCommitId: 501db0f17ef6df184fcdbfbe0f87cde2313b6ab1 # 2023.04.15
- uses: lukka/run-cmake@c2b72aff009141774c5a5fabe74ea46c8c04d9c4 # v10.6
with:
configurePreset: "Host"
buildPreset: "Host-Debug"
testPreset: "Host"
configurePresetAdditionalArgs: "['-DCMAKE_C_COMPILER_LAUNCHER=sccache', '-DCMAKE_CXX_COMPILER_LAUNCHER=sccache']"
- name: Upload test logs
if: ${{ failure() }}
uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
with:
name: test-logs
path: build/Host/Testing/Temporary/
host_build_test_macos:
name: Host Build & Test
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-latest]
os: [windows-latest, windows-2019, macos-latest]
steps:
- uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
with:
Expand Down

0 comments on commit d8a9f98

Please sign in to comment.