diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 388c1806205081bfd402ec8afafd5091d3417fbc..d05797b5fd7ece210811725f1886c70117b5a383 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,3 @@ - variables: GIT_VERSION: "2.40.0" PYTHON_VERSION: "3.10.8" @@ -27,10 +26,9 @@ workflow: - sudo python -m pip install --upgrade pip - sudo python -m pip install --upgrade conan # Build git with conan - - conan config init - - conan profile update settings.compiler.libcxx=libstdc++11 default - - conan create . git/${GIT_VERSION}@soleil/stable --build -c tools.system.package_manager:mode=install -c tools.system.package_manager:tool=yum -c tools.system.package_manager:sudo=True - - conan install git/${GIT_VERSION}@soleil/stable --install-folder ${CI_PROJECT_DIR}/${NAME} + - conan profile detect --force + - conan create . git/${GIT_VERSION}@soleil/stable -s compiler.libcxx=libstdc++11 --build -c tools.system.package_manager:mode=install -c tools.system.package_manager:tool=yum -c tools.system.package_manager:sudo=True + - conan install git/${GIT_VERSION}@soleil/stable -s compiler.libcxx=libstdc++11 --install-folder ${CI_PROJECT_DIR}/${NAME} artifacts: name: ${NAME} paths: