diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7465047edf2da8a7682093a9561e34930b106f86..a2867ca0ac620e92f073272933ef2df3122f58d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - CONAN_VERSION: "2.0.13" + CONAN_VERSION: "2.0.17" PYTHON_VERSION: "3.6.13" workflow: diff --git a/README.md b/README.md index 69a4386750ae56f53b1ff6b0bf8adf5c6bb4a38d..36d2426af0b57be872b8639b48e8ce55ed63bda8 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ## Pipeline to create Conan package for Linux -Conan 2.0.13 for: -* Linux 32 bits: [conan-2.0.13-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.13/download?job=linux-i686) -* Linux 64 bits: [conan-2.0.13-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.0.13/download?job=linux-x86_64) +Conan 2.0.17 for: +* Linux 32 bits: [conan-2.0.17-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.17/download?job=linux-i686) +* Linux 64 bits: [conan-2.0.17-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.0.17/download?job=linux-x86_64) ## Python script to create Conan package for Windows 32 bits @@ -19,6 +19,6 @@ To launch build: python build-windows-i386.py ``` -The build deliveries the archive `build\conan-2.0.13-windows-i386.zip` +The build deliveries the archive `build\conan-2.0.17-windows-i386.zip` Tested with python 3.6 on Windows 7 32 bits. Warning, it is mandatory to use installed version python on Windows 7 to include all dll in package with PytInstaller. diff --git a/build-windows-i386.py b/build-windows-i386.py index bdb48ac5831392c1765c7e5a8d587c97b26ebc56..c66a656a45a320b0f6544939138ab654b1d2a3a3 100644 --- a/build-windows-i386.py +++ b/build-windows-i386.py @@ -3,7 +3,7 @@ import subprocess import urllib.request import shutil -CONAN_VERSION = '2.0.13' +CONAN_VERSION = '2.0.17' CONAN_ROOT = os.path.dirname(os.path.abspath(__file__))