matrix-coro

commit e0f4e21ea37d587378ae9642562483a623d19345
parent 745f0137441da774cb605f0ed2e5f0310dd06d8c
Author: MTRNord <mtrnord1@gmail.com>
Date:   Tue, 24 Sep 2024 01:03:22 +0200

Also try to fix deps on windows

Diffstat:
M
.github/workflows/cmake-multi-platform.yml
 | 
18
+++++++-----------

1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -64,11 +64,6 @@ jobs:
         if: startsWith(matrix.os, 'windows')
         uses: friendlyanon/setup-vcpkg@v1
 
-      # Install the dependencies if windows
-      - name: Install dependencies
-        if: startsWith(matrix.os, 'windows')
-        run: vcpkg install curl spdlog jsoncpp
-
       - name: Configure CMake
         # Only run this step if we are not on windows as windows will use the vcpkg toolchain file. So this only runs on macos or linux.
         if: startsWith(matrix.os, 'ubuntu') || startsWith(matrix.os, 'macos')
@@ -88,12 +83,13 @@ jobs:
 
         # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
         # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-        run: >
-          cmake -B ${{ steps.strings.outputs.build-output-dir }}
-          -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
-          -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
-          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-          -D "CMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
+        run: |
+          vcpkg install curl spdlog jsoncpp
+          cmake -B ${{ steps.strings.outputs.build-output-dir }} \
+          -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} \
+          -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} \
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+          -D "CMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake" \
           -S ${{ github.workspace }}
 
       - name: Build