diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 71ef7eec69579ac7b3c048bed3c45a59a8843358..cc1792eace2f1e5f91b866ce2c8dd37ccf0b99bf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - CONAN_VERSION: "2.6.0" + CONAN_VERSION: "2.12.1" PYTHON_VERSION: "3.6.13" workflow: diff --git a/README.md b/README.md index ce930d70e2b14e03ec75e2ce193197ded7fa2aed..6cfb14ec8a785a4de727d0280378901a8da8fb46 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ## Pipeline to create Conan package for Linux -Conan 2.6.0 for: -* Linux 32 bits: [conan-2.6.0-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.6.0/download?job=linux-i686) -* Linux 64 bits: [conan-2.6.0-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.6.0/download?job=linux-x86_64) +Conan 2.12.1 for: +* Linux 32 bits: [conan-2.12.1-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.12.1/download?job=linux-i686) +* Linux 64 bits: [conan-2.12.1-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.12.1/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.6.0-windows-i386.zip` +The build deliveries the archive `build\conan-2.12.1-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 a383fc25112b1fc95dbde6431c0c261cb15765b8..99d49143d760475fc2301078b610a1f328d4f2be 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.6.0' +CONAN_VERSION = '2.12.1' CONAN_ROOT = os.path.dirname(os.path.abspath(__file__))