@@ -169,20 +169,32 @@ jobs:
169169 conan remote add artifactory https://mpusz.jfrog.io/artifactory/api/conan/conan-oss
170170 echo 'tools.cmake.cmake_layout:build_folder_vars=["settings.compiler", "settings.compiler.version", "settings.compiler.cppstd"]' >> ~/.conan2/global.conf
171171 conan profile show -pr default
172+ - name : Install Conan dependencies
173+ shell : bash
174+ run : |
175+ conan install . -b missing ${{ matrix.conan-settings }} \
176+ -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" \
177+ -c user.mp-units.build:all=False ${{ matrix.conan-args }}
172178 - name : Print tool versions
179+ if : matrix.toolchain.compiler.type == 'MSVC'
180+ shell : cmd
181+ run : |
182+ call build\${{ matrix.conan-build-folder }}\generators\conanbuild.bat
183+ %CXX% 2>&1 || ver > nul
184+ cmake --version 2>&1 || ver > nul
185+ ninja --version 2>&1 || ver > nul
186+ conan --version
187+ python3 --version
188+ - name : Print tool versions
189+ if : matrix.toolchain.compiler.type != 'MSVC'
173190 shell : bash
174191 run : |
192+ source build/${{ matrix.conan-build-folder }}/generators/conanbuild.sh
175193 ${CXX} --version 2>&1 || true
176194 cmake --version 2>&1 || true
177195 ninja --version 2>&1 || true
178196 conan --version
179197 python3 --version
180- - name : Install Conan dependencies
181- shell : bash
182- run : |
183- conan install . -b missing ${{ matrix.conan-settings }} \
184- -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" \
185- -c user.mp-units.build:all=False ${{ matrix.conan-args }}
186198 - name : Provide dependencies for the build
187199 shell : bash
188200 working-directory : src
0 commit comments