mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-03 04:14:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: VISUAL renamed to MSVC

Browse Source
This commit is contained in:
Mateusz Pusz
2021-04-29 13:46:09 +02:00
parent cc5a848237
commit f4ccb9c7fc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci-conan.yml vendored
View File

@@ -41,7 +41,7 @@ jobs:
- { - {
name: "Windows MSVC 2019", name: "Windows MSVC 2019",
os: windows-latest, 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", name: "Ubuntu GCC 10.1.0",

6
.github/workflows/ci-test-package-cmake.yml vendored
View File

@@ -45,7 +45,7 @@ jobs:
- { - {
name: "Windows MSVC 2019", name: "Windows MSVC 2019",
os: windows-latest, os: windows-latest,
compiler: { type: VISUAL, version: 16, cc: "", cxx: "" } compiler: { type: MSVC, version: 16, cc: "", cxx: "" }
} }
- { - {
name: "Ubuntu GCC 10.1.0", name: "Ubuntu GCC 10.1.0",
@@ -153,7 +153,7 @@ jobs:
shell: bash shell: bash
working-directory: build/${{ matrix.build_type }} working-directory: build/${{ matrix.build_type }}
run: | run: |
if [[ "${{ matrix.config.compiler.type }}" == "VISUAL" ]]; then if [[ "${{ matrix.config.compiler.type }}" == "MSVC" ]]; then
conanvcvars.bat conanvcvars.bat
fi fi
cmake ../../src -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake cmake ../../src -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake
@@ -167,7 +167,7 @@ jobs:
run: | run: |
mkdir -p test_package/build/${{ matrix.build_type }} && cd test_package/build/${{ matrix.build_type }} mkdir -p test_package/build/${{ matrix.build_type }} && cd test_package/build/${{ matrix.build_type }}
conan install ../../.. conan install ../../..
if [[ "${{ matrix.config.compiler.type }}" == "VISUAL" ]]; then if [[ "${{ matrix.config.compiler.type }}" == "MSVC" ]]; then
conanvcvars.bat conanvcvars.bat
fi fi
cmake ../.. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_INSTALL_PREFIX=../../../build/${{ matrix.build_type }}/test_package cmake ../.. -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake -DCMAKE_INSTALL_PREFIX=../../../build/${{ matrix.build_type }}/test_package