From a804851b490276d196a3360de81246b944bcaaba Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Tue, 4 Apr 2023 22:49:05 +0200
Subject: [PATCH] Update for Conan 2
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6afa5ea..19ddb58 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,8 +27,8 @@ workflow:
- sudo python -m pip install --upgrade conan
# Build git with conan
- 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}
+ - conan create . --name git --version ${GIT_VERSION} --user soleil --channel 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 --name git --version ${GIT_VERSION} --user soleil --channel stable -s compiler.libcxx=libstdc++11 --install-folder ${CI_PROJECT_DIR}/${NAME}
artifacts:
name: ${NAME}
paths:
--
GitLab