diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0ed8b7dd1a18a844d0dc51c3d4a27a527b636fd..47b24fac51ae251da165cf474eba685f9aecb41a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - CONAN_VERSION: "2.0.4" + CONAN_VERSION: "2.0.5" PYTHON_VERSION: "3.6.13" workflow: diff --git a/README.md b/README.md index 3f2e7741f0c4e7a043a9300155f5fecf088ced99..3afdc50f1875e78d11187a39d33efc3e9b4691ad 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ## Pipeline to create Conan package for Linux -Conan 2.0.4 for: -* Linux 32 bits: [conan-2.0.4-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.4/download?job=linux-i686) -* Linux 64 bits: [conan-2.0.4-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.0.4/download?job=linux-x86_64) +Conan 2.0.5 for: +* Linux 32 bits: [conan-2.0.5-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-i686) +* Linux 64 bits: [conan-2.0.5-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.0.5/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.4-windows-i386.zip` +The build deliveries the archive `build\conan-2.0.5-windows-i386.zip` Tested with python 3.7 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 76deeab593fb1bd0fdcb5f51dcc65d0263c58e19..46ca63ec753988b568c36a94c3fc26ced9e9b91e 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.4' +CONAN_VERSION = '2.0.5' CONAN_ROOT = os.path.dirname(os.path.abspath(__file__))