Skip to content
Snippets Groups Projects
Commit fd9e5218 authored by MADELA Patrick's avatar MADELA Patrick
Browse files

Merge branch 'main' into 'python-3.6.13'

Update to conan 2.0.1

See merge request !5
parents d7a7a5c7 71f8a1c1
No related branches found
No related tags found
2 merge requests!6Python 3.6.13,!5Update to conan 2.0.1
Pipeline #1896 passed
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
......
......@@ -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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment