Skip to content
Snippets Groups Projects
Commit c2790dd9 authored by U-SOLEIL\madela's avatar U-SOLEIL\madela
Browse files

Update to Conan 2.4.1

parent ab300b0b
No related branches found
No related tags found
No related merge requests found
Pipeline #3885 failed
variables: variables:
CONAN_VERSION: "2.0.17" CONAN_VERSION: "2.4.1"
PYTHON_VERSION: "3.6.13" PYTHON_VERSION: "3.6.13"
workflow: workflow:
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
## Pipeline to create Conan package for Linux ## Pipeline to create Conan package for Linux
Conan 2.0.17 for: Conan 2.4.1 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 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.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) * 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)
## Python script to create Conan package for Windows 32 bits ## Python script to create Conan package for Windows 32 bits
...@@ -19,6 +19,6 @@ To launch build: ...@@ -19,6 +19,6 @@ To launch build:
python build-windows-i386.py python build-windows-i386.py
``` ```
The build deliveries the archive `build\conan-2.0.17-windows-i386.zip` The build deliveries the archive `build\conan-2.4.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. 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.
...@@ -3,7 +3,7 @@ import subprocess ...@@ -3,7 +3,7 @@ import subprocess
import urllib.request import urllib.request
import shutil import shutil
CONAN_VERSION = '2.0.17' CONAN_VERSION = '2.4.1'
CONAN_ROOT = os.path.dirname(os.path.abspath(__file__)) CONAN_ROOT = os.path.dirname(os.path.abspath(__file__))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment