diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 99557a7..6bccfeb 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -21,11 +21,6 @@ jobs: matrix: os: [windows-latest, ubuntu-latest] build_configuration: [Debug, Release] - include: - - os: windows-latest - - triplet: x64-windows - - os: ubuntu-latest - - triplet: x64-linux steps: - name: checkout @@ -33,16 +28,17 @@ jobs: with: submodules: true - - name: Boostrap Vcpkg + - if: runner.os == 'Windows' + name: Boostrap Vcpkg run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg -disableMetrics - if: runner.os == 'Windows' name: Install packaged dependencies - run: ${{github.workspace}}\external\vcpkg\vcpkg.exe install spdlog --triplet ${{matrix.triplet}} + run: ${{github.workspace}}\external\vcpkg\vcpkg.exe install spdlog --triplet x64-windows - if: runner.os != 'Windows' name: Install packaged dependencies - run: ${{github.workspace}}/external/vcpkg/vcpkg install spdlog --triplet ${{matrix.triplet}} + run: ${{github.workspace}}/external/vcpkg/vcpkg install spdlog --triplet x64-linux - name: Configure CMake # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.