From 822fe0b486616281720beb41f86d31bd94020097 Mon Sep 17 00:00:00 2001 From: Sander Mertens Date: Thu, 4 May 2023 14:12:08 -0700 Subject: [PATCH] Add legacy visual studio versions to CI --- .github/workflows/ci.yml | 53 ++++++++++++++++--- .../scene_management/src/main.cpp | 1 + 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32136ae18..d58d7d20e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -163,6 +163,47 @@ jobs: - name: build examples (release) run: bake/bake examples --strict --cfg debug + build-configs-windows-cmake: + runs-on: windows-latest + timeout-minutes: 30 + + strategy: + matrix: + toolset: [default, v141, v142, clang-cl] + include: + - toolset: v141 + toolset_option: -T"v141" + - toolset: v142 + toolset_option: -T"v142" + - toolset: clang-cl + toolset_option: -T"ClangCl" + + steps: + - uses: actions/checkout@v3 + - name: create cmake build folders + run: | + mkdir cmake_build + mkdir examples/c/cmake_build + mkdir examples/cpp/cmake_build + + - name: build flecs + working-directory: cmake_build + run: | + cmake ${{ matrix.toolset_option }} .. + cmake --build . -j 4 + + - name: build c examples + working-directory: examples/c/cmake_build + run: | + cmake ${{ matrix.toolset_option }} .. + cmake --build . -j 4 + + - name: build c++ examples + working-directory: examples/cpp/cmake_build + run: | + cmake ${{ matrix.toolset_option }} .. + cmake --build . -j 4 + test-c-unix: needs: [build-linux, build-macos] runs-on: ${{ matrix.os }} @@ -484,15 +525,11 @@ jobs: strategy: fail-fast: false matrix: - os: [ ubuntu-latest, macOS-latest, windows-latest ] + os: [ ubuntu-latest, macOS-latest ] steps: - uses: actions/checkout@v3 - - name: "msvc dev" - if: matrix.os == 'windows-latest' - uses: ilammy/msvc-dev-cmd@v1 - - name: create cmake build folders run: | mkdir cmake_build @@ -503,19 +540,19 @@ jobs: working-directory: cmake_build run: | cmake .. - cmake --build . + cmake --build . -j 4 - name: build c examples working-directory: examples/c/cmake_build run: | cmake .. - cmake --build . + cmake --build . -j 4 - name: build c++ examples working-directory: examples/cpp/cmake_build run: | cmake .. - cmake --build . + cmake --build . -j 4 buildsystem-meson: runs-on: ubuntu-latest diff --git a/examples/cpp/game_mechanics/scene_management/src/main.cpp b/examples/cpp/game_mechanics/scene_management/src/main.cpp index 9b8a257a5..ff73cf177 100644 --- a/examples/cpp/game_mechanics/scene_management/src/main.cpp +++ b/examples/cpp/game_mechanics/scene_management/src/main.cpp @@ -1,5 +1,6 @@ #include #include +#include // This example shows one possible way to implement scene management // using pipelines.