Change: to loop through the matrix

mjshakir · May 29, 2024 · 0516877 · 0516877
1 parent 9664dff
commit 0516877
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/.github/workflows/macos_arm.yml b/.github/workflows/macos_arm.yml
@@ -53,7 +53,7 @@ jobs:
         fi
 
     - name: Install dependencies
-      run: ${{ matrix.install }}
+      run: ${{ matrix.config.install }}
 
     - name: Setup CMake and Ninja
       uses: lukka/[email protected]
@@ -65,7 +65,7 @@ jobs:
       run: mkdir build
 
     - name: Configure CMake
-      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_opts }}
+      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release ${{ matrix.config.cmake_opts }}
 
     - name: Build
       run: cmake --build build --config Release
diff --git a/.github/workflows/macos_x86_64.yml b/.github/workflows/macos_x86_64.yml
@@ -53,7 +53,7 @@ jobs:
         fi
 
     - name: Install dependencies
-      run: ${{ matrix.install }}
+      run: ${{ matrix.config.install }}
 
     - name: Setup CMake and Ninja
       uses: lukka/[email protected]
@@ -65,7 +65,7 @@ jobs:
       run: mkdir build
 
     - name: Configure CMake
-      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_opts }}
+      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release ${{ matrix.config.cmake_opts }}
 
     - name: Build
       run: cmake --build build --config Release
diff --git a/.github/workflows/windows_x86_64.yml b/.github/workflows/windows_x86_64.yml
@@ -70,12 +70,7 @@ jobs:
 
     - name: Install Dependencies
       run: |
-        $dependencies = @(
-          'boost:x64-windows',
-          'gtest:x64-windows',
-          'tbb:x64-windows',
-          'fmt:x64-windows'
-        )
+        $dependencies = @(${{ matrix.config.dependencies }})
         foreach ($dep in $dependencies) {
           .\vcpkg\vcpkg.exe install $dep
         }
@@ -127,7 +122,7 @@ jobs:
       if: steps.check_msvc.outputs.skip_step != 'true'
       run: |
         echo "CMAKE_TOOLCHAIN_FILE is: $env:CMAKE_TOOLCHAIN_FILE"
-        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ${{ matrix.cmake_opts }}
+        cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=$env:CMAKE_TOOLCHAIN_FILE ${{ matrix.config.cmake_opts }}
 
     - name: List build directory contents
       run: Get-ChildItem -Recurse build/