From 9fc1aa3e81efba1762a364f416a2d9dc9427bc8c Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Tue, 13 Aug 2024 10:47:44 +0200 Subject: [PATCH] Update to Conan 2.6.0 --- .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 92a16ea..71ef7ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - CONAN_VERSION: "2.4.1" + CONAN_VERSION: "2.6.0" PYTHON_VERSION: "3.6.13" workflow: diff --git a/README.md b/README.md index 0b98d4b..ce930d7 100644 --- a/README.md +++ b/README.md @@ -2,9 +2,9 @@ ## Pipeline to create Conan package for Linux -Conan 2.4.1 for: -* Linux 32 bits: [conan-2.4.1-linux-i686.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686) -* Linux 64 bits: [conan-2.4.1-linux-x86_64.zip](https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.4.1/download?job=linux-x86_64) +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) ## 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.4.1-windows-i386.zip` +The build deliveries the archive `build\conan-2.6.0-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 a2ba6de..a383fc2 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.4.1' +CONAN_VERSION = '2.6.0' CONAN_ROOT = os.path.dirname(os.path.abspath(__file__)) -- GitLab