From c8ec0ca1f568ef4b258cc1af84886421f5896c2a Mon Sep 17 00:00:00 2001 From: McMassiveNZ <12842622+McMassiveNZ@users.noreply.github.com> Date: Fri, 23 Dec 2022 23:18:22 +0100 Subject: [PATCH] Update cmake.yml --- .github/workflows/cmake.yml | 44 +++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 4d82be7..5cea8f1 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -28,31 +28,33 @@ jobs: with: submodules: true - #- if: runner.os == 'Windows' - name: Boostrap Vcpkg - run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg -disableMetrics + if: runner.os == 'Windows' + run: ${{github.workspace}}\external\vcpkg\bootstrap-vcpkg.bat -disableMetrics + if: runner.os != 'Windows' + run: ${{github.workspace}}/external/vcpkg/bootstrap-vcpkg.sh -disableMetrics - - if: runner.os == 'Windows' - name: Install packaged dependencies - 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.exe install spdlog --triplet x64-windows - - if: runner.os != 'Windows' - name: Install packaged dependencies - run: ${{github.workspace}}/external/vcpkg/vcpkg install spdlog --triplet x64-linux + #- if: runner.os != 'Windows' + # name: Install packaged dependencies + # 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. - # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type - run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_configuration}} - -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/external/vcpkg/scripts/buildsystems/vcpkg.cmake + #- 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. + # # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + # run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{matrix.build_configuration}} + # -DCMAKE_TOOLCHAIN_FILE=${{github.workspace}}/external/vcpkg/scripts/buildsystems/vcpkg.cmake - - name: Build - # Build your program with the given configuration - run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_configuration}} + #- name: Build + # # Build your program with the given configuration + # run: cmake --build ${{github.workspace}}/build --config ${{matrix.build_configuration}} - - name: Test - working-directory: ${{github.workspace}}/build - # Execute tests defined by the CMake configuration. - # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail - run: ctest -C ${{matrix.build_configuration}} + #- name: Test + # working-directory: ${{github.workspace}}/build + # # Execute tests defined by the CMake configuration. + # # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail + # run: ctest -C ${{matrix.build_configuration}}