From a75597c8fe75e65a64844c2bc7777bcfb04b18fc Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Thu, 16 Mar 2023 22:35:29 +0100
Subject: [PATCH] Revert "Update for conan 2"
This reverts commit 08faff75e79b2a036efeea5f53b4da3fa4a9d3c4
---
.gitlab-ci.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39a6e4f..f5388f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,8 +15,9 @@ workflow:
.build:
stage: build
script:
- - conan profile detect --force
- - conan create . python/${PYTHON_VERSION}@soleil/stable --build -s compiler.libcxx=libstdc++11 -c tools.system.package_manager:mode=install -c tools.system.package_manager:tool=yum -c tools.system.package_manager:sudo=True
+ - conan config init
+ - conan profile update settings.compiler.libcxx=libstdc++11 default
+ - conan create . python/${PYTHON_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 python/${PYTHON_VERSION}@soleil/stable --install-folder ${PYTHON_ROOT}
# Upgrade pip
- unset PYTHONPATH
--
GitLab