From ab300b0b4db10f05fac17ed1fdc98b2455ccee65 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Wed, 7 Feb 2024 09:48:00 +0100 Subject: [PATCH] Update to Conan 2.0.17 --- .gitlab-ci.yml | 2 +- README.md | 8 ++++---- build-windows-i386.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7465047..a2867ca 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 69a4386..36d2426 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 bdb48ac..c66a656 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__)) -- GitLab