diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 16f459bf1ee003125f0c482ad290f45f48db694c..8c3ab7e22cce69fe1901617369ce2648820a21af 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - CONAN_VERSION: "2.0.6" + CONAN_VERSION: "2.0.7" PYTHON_VERSION: "3.6.13" workflow: diff --git a/README.md b/README.md index 68fa08ced75a04d9168f9e5dd09d454a95571063..63372db43b65df86f88eafc01ce830c6d1393c54 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ## Pipeline to create Conan package for Linux -Conan 2.0.6 for: -* Linux 32 bits: [conan-2.0.6-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.6/download?job=linux-i686) -* Linux 64 bits: [conan-2.0.6-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.0.6/download?job=linux-x86_64) +Conan 2.0.7 for: +* Linux 32 bits: [conan-2.0.7-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686) +* Linux 64 bits: [conan-2.0.7-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.0.7/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.6-windows-i386.zip` +The build deliveries the archive `build\conan-2.0.7-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 385c0f802905752c526993b31357022be27af467..56add9dc3e7177ccb60007f30c61d47480632880 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.6' +CONAN_VERSION = '2.0.7' CONAN_ROOT = os.path.dirname(os.path.abspath(__file__))