From 309811cfbae6a17f658fda84fcf4eeb62771c6f4 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Thu, 6 Oct 2022 23:21:33 +0200 Subject: [PATCH] Fix build issue --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35c37df..90d02d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,6 @@ variables: - CONAN_VERSION: "2.36.2" + CONAN_VERSION: "1.52.0" PYTHON_VERSION: "3.6.13" stages: @@ -14,11 +14,11 @@ stages: # Install python 3 - curl -s -L -o ${PYTHON_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/python3/-/jobs/artifacts/main/download?job=${PLATFORM} - unzip -q ${PYTHON_ROOT}.zip -d ${CI_PROJECT_DIR} - - rm ${PYTHON_ROOT}.zip + - rm -f ${PYTHON_ROOT}.zip # Install conan - - ${PYTHON_ROOT}/bin/pip3 install -q --no-cache-dir --prefix=${CONAN_ROOT} conan==${CONAN_VERSION} conan-package-tools + - ${CI_PROJECT_DIR}/${PYTHON_ROOT}/bin/python -m pip install -q --no-cache-dir --prefix=${CI_PROJECT_DIR}/${CONAN_ROOT} conan==${CONAN_VERSION} conan-package-tools # Fix python shebang to make it independent of install path - - grep -I -r -l "^#\!${PYTHON_ROOT}/bin/python.*$" ${CONAN_ROOT} | xargs sed -i '1c\#\!/usr/bin/env python' + - grep -I -r -l "^#\!${CI_PROJECT_DIR}/${PYTHON_ROOT}/bin/python.*$" ${CI_PROJECT_DIR}/${CONAN_ROOT} | xargs sed -i '1c\#\!/usr/bin/env python' # Clean pycache - find ${CI_PROJECT_DIR}/${CONAN_ROOT} -iname __pycache__ -print0 | xargs -0 rm -rf artifacts: -- GitLab