From d127fea13fb025b3ebd20c5b569e5432757329bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20S=C3=BC=C3=9Fenbach?= <asuessenbach@nvidia.com>
Date: Mon, 8 Jan 2024 09:02:32 +0100
Subject: [PATCH] Loop over cpp_standard and build_type in macos CI (#1766)

---
 .github/workflows/ci-macos.yml | 42 +++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
index 4b05537..732b7b3 100644
--- a/.github/workflows/ci-macos.yml
+++ b/.github/workflows/ci-macos.yml
@@ -11,11 +11,7 @@ jobs:
     
     strategy:
       matrix:
-        build_type: [Debug, Release]
-        compiler:
-          - {cxx: "g++-11", c: "clang"}
-          - {cxx: "clang++", c: "clang"}
-        cxx_standard: [11, 14, 17, 20, 23]
+        compiler: [clang++, g++-11]
 
     steps:
     - uses: actions/checkout@v4
@@ -31,19 +27,23 @@ jobs:
       with:
         version: 1.11.0
       
-    - name: Configure CMake
-      run: cmake -B ${{github.workspace}}/build -GNinja
-            -DVULKAN_HPP_SAMPLES_BUILD=ON
-            -DVULKAN_HPP_SAMPLES_BUILD_ONLY_DYNAMIC=ON
-            -DVULKAN_HPP_SAMPLES_BUILD_WITH_LOCAL_VULKAN_HPP=ON
-            -DVULKAN_HPP_TESTS_BUILD=ON
-            -DVULKAN_HPP_TESTS_BUILD_ONLY_DYNAMIC=ON
-            -DVULKAN_HPP_TESTS_BUILD_WITH_LOCAL_VULKAN_HPP=ON
-            -DVULKAN_HPP_RUN_GENERATOR=ON
-            -DCMAKE_CXX_COMPILER=${{matrix.compiler.cxx}}
-            -DCMAKE_C_COMPILER=${{matrix.compiler.c}}
-            -DCMAKE_CXX_STANDARD=${{matrix.cxx_standard}}
-            -DCMAKE_BUILD_TYPE=${{matrix.build_type}}
-
-    - name: Build
-      run: cmake --build ${{github.workspace}}/build --parallel
+    - name: Loop over cpp_standards (11, 14, ...) and build_types (Debug, Release)
+      run: |
+        for cpp_standard in 11 14 17 20 23
+        do
+          for build_type in Debug Release
+          do
+            cmake -B build/$cpp_standard/$build_type -GNinja \
+              -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_COMPILER=${{matrix.compiler}}      \
+              -DCMAKE_CXX_STANDARD=$cpp_standard             \
+              -DCMAKE_BUILD_TYPE=$build_type
+            cmake --build build/$cpp_standard/$build_type --parallel
+          done
+        done