From 041377c24cccb80edb4e429dda073b1d9bd5d217 Mon Sep 17 00:00:00 2001 From: numzero Date: Sun, 2 Jul 2023 22:37:35 +0300 Subject: [PATCH] CI: Add MSVC/SDL builds --- .github/workflows/build.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ae889f4..85cbd52a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -200,7 +200,7 @@ jobs: ./bin/OSX/AutomatedTest null msvc: - name: VS 2019 ${{ matrix.config.arch }} + name: VS 2019 ${{ matrix.config.arch }} ${{ matrix.sdl.label }} runs-on: windows-2019 env: VCPKG_VERSION: 14e7bb4ae24616ec54ff6b2f6ef4e8659434ea44 @@ -218,6 +218,14 @@ jobs: arch: x64 generator: "-G'Visual Studio 16 2019' -A x64" vcpkg_triplet: x64-windows + sdl: + - + use: FALSE + label: '(no SDL)' + - + use: TRUE + label: '(with SDL)' + vcpkg_packages: sdl2 steps: - name: Checkout @@ -226,7 +234,7 @@ jobs: - name: Restore from cache and run vcpkg uses: lukka/run-vcpkg@v7 with: - vcpkgArguments: ${{env.vcpkg_packages}} + vcpkgArguments: ${{env.vcpkg_packages}} ${{matrix.sdl.vcpkg_packages}} vcpkgDirectory: '${{ github.workspace }}\vcpkg' appendedCacheKey: ${{ matrix.config.vcpkg_triplet }} vcpkgGitCommitId: ${{ env.VCPKG_VERSION }} @@ -235,6 +243,7 @@ jobs: - name: CMake run: | cmake ${{matrix.config.generator}} ` + -DUSE_SDL2=${{matrix.sdl.use}} ` -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" ` -DCMAKE_BUILD_TYPE=Release .