From 2a19ddd7e48585a9b9e416defd281d06ac8ac0d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= Date: Tue, 21 Jan 2025 12:21:07 +0100 Subject: [PATCH] Switch windows workflow from looping over C++ standards to one standard per job (#2050) --- .github/workflows/ci-windows.yml | 35 +++++++++++++------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/.github/workflows/ci-windows.yml b/.github/workflows/ci-windows.yml index ae507cb..0a9a15c 100644 --- a/.github/workflows/ci-windows.yml +++ b/.github/workflows/ci-windows.yml @@ -17,6 +17,8 @@ jobs: matrix: os: [windows-2019, windows-2022] architecture: [x86, x64] + cpp_standard: [11, 14, 17, 20, 23] + build_type: [Debug, Release] steps: - uses: actions/checkout@v4 @@ -28,25 +30,16 @@ jobs: with: arch: ${{matrix.architecture}} - - name: Loop over cpp_standards (11, 14, ...) and build_types (Debug, Release) + - name: Build run: | - for cpp_standard in 11 14 17 20 23 - do - for build_type in Debug Release - do - echo "=================================================================================" - echo "Building C++"$cpp_standard" in "$build_type" mode on "${{matrix.os}}" with architecture "${{matrix.architecture}} - echo "=================================================================================" - cmake -B build/$cpp_standard/$build_type \ - -DVULKAN_HPP_SAMPLES_BUILD=ON \ - -DVULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC=ON \ - -DVULKAN_HPP_TESTS_BUILD=ON \ - -DVULKAN_HPP_TESTS_BUILD_ONLY_DYNAMIC=ON \ - -DVULKAN_HPP_BUILD_WITH_LOCAL_VULKAN_HPP=ON \ - -DVULKAN_HPP_PRECOMPILE=OFF \ - -DVULKAN_HPP_RUN_GENERATOR=ON \ - -DCMAKE_CXX_STANDARD=$cpp_standard \ - -DCMAKE_BUILD_TYPE=$build_type - cmake --build build/$cpp_standard/$build_type --parallel - done - done + cmake -B build/${{matrix.cpp_standard}}/${{matrix.build_type}} \ + -DVULKAN_HPP_SAMPLES_BUILD=ON \ + -DVULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC=ON \ + -DVULKAN_HPP_TESTS_BUILD=ON \ + -DVULKAN_HPP_TESTS_BUILD_ONLY_DYNAMIC=ON \ + -DVULKAN_HPP_BUILD_WITH_LOCAL_VULKAN_HPP=ON \ + -DVULKAN_HPP_PRECOMPILE=OFF \ + -DVULKAN_HPP_RUN_GENERATOR=ON \ + -DCMAKE_CXX_STANDARD=${{matrix.cpp_standard}} \ + -DCMAKE_BUILD_TYPE=${{matrix.build_type}} + cmake --build build/${{matrix.cpp_standard}}/${{matrix.build_type}} --parallel