diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml index 668e6559..62f0ddc0 100644 --- a/.github/workflows/ci-conan.yml +++ b/.github/workflows/ci-conan.yml @@ -41,7 +41,7 @@ jobs: - { name: "Windows MSVC 2019", os: windows-latest, - compiler: { type: VISUAL, version: 16, cc: "cl", cxx: "cl" } + compiler: { type: MSVC, version: 16, cc: "cl", cxx: "cl" } } - { name: "Ubuntu GCC 10.1.0", diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index 9008d6f6..87ccceda 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -45,7 +45,7 @@ jobs: - { name: "Windows MSVC 2019", os: windows-latest, - compiler: { type: VISUAL, version: 16, cc: "", cxx: "" } + compiler: { type: MSVC, version: 16, cc: "", cxx: "" } } - { name: "Ubuntu GCC 10.1.0", @@ -153,7 +153,7 @@ jobs: shell: bash working-directory: build/${{ matrix.build_type }} run: | - if [[ "${{ matrix.config.compiler.type }}" == "VISUAL" ]]; then + if [[ "${{ matrix.config.compiler.type }}" == "MSVC" ]]; then conanvcvars.bat fi cmake ../../src -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake @@ -167,7 +167,7 @@ jobs: run: | mkdir -p test_package/build/${{ matrix.build_type }} && cd test_package/build/${{ matrix.build_type }} conan install ../../.. - if [[ "${{ matrix.config.compiler.type }}" == "VISUAL" ]]; then + if [[ "${{ matrix.config.compiler.type }}" == "MSVC" ]]; then conanvcvars.bat fi cmake ../.. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_INSTALL_PREFIX=../../../build/${{ matrix.build_type }}/test_package