From 64e2027ad6ed3f60d3a6402ea7770460f3077150 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Thu, 1 Dec 2022 00:49:29 +0100
Subject: [PATCH] Fix .gitlab-ci.yml
---
.gitlab-ci.yml | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab77af0..8ba4e3e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,18 +18,19 @@ workflow:
.build:
stage: build
script:
- - curl -L -o python.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/${PYTHON_VERSION}/download?job=${PLATFORM}
- - unzip python.zip
+ # Install recent version of python required to build meson that is a requirement for building chain of git
+ - curl -s -L -o python.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/${PYTHON_VERSION}/download?job=${PLATFORM}
+ - unzip -q python.zip
- rm python.zip
- export PATH=$(readlink -e .)/python-${PYTHON_VERSION}-${PLATFORM}/bin:${PATH}
- - echo $PATH
- - python --version
+ - python --version | grep ${PYTHON_VERSION}
- 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 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}
artifacts:
name: ${NAME}
paths:
--
GitLab