diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 336027440ceace5b944fb58daa8514323a9fea39..9fab765fb3f8cc7a554caec1f519b915f05e7c5f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - CONAN_VERSION: "1.59.0" + CONAN_VERSION: "2.0.1" PYTHON_VERSION: "3.6.13" workflow: @@ -21,7 +21,7 @@ stages: - unzip -q ${PYTHON_ROOT}.zip -d ${CI_PROJECT_DIR} - rm -f ${PYTHON_ROOT}.zip # Install conan - - ${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 + - ${CI_PROJECT_DIR}/${PYTHON_ROOT}/bin/python -m pip install -q --no-cache-dir --prefix=${CI_PROJECT_DIR}/${CONAN_ROOT} conan==${CONAN_VERSION} # Fix python shebang to make it independent of install path - 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 diff --git a/README.md b/README.md index a0d4abf3e73e6b936a3264ce8e1bbe682b4f4638..2a813d8201674dc64a4cbde958f9228b84f52ed3 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,6 @@ Pipeline to create Conan package for Python 3.6.13. -Conan 1.59.0 for: -* Linux 32 bits: [conan-1.59.0-linux-python-3.6.13-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686) -* Linux 64 bits: [conan-1.59.0-linux-python-3.6.13-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/python-3.6.13//download?job=linux-x86_64) +Conan 2.0.1 for: +* Linux 32 bits: [conan-2.0.1-linux-python-3.6.13-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/python-3.6.13/download?job=linux-i686) +* Linux 64 bits: [conan-2.0.1-linux-python-3.6.13-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/python-3.6.13//download?job=linux-x86_64)