Skip to content
Snippets Groups Projects
Commit 9fc1aa3e authored by MADELA Patrick's avatar MADELA Patrick
Browse files

Update to Conan 2.6.0

parent e5dd7676
No related branches found
Tags 2.6.0
No related merge requests found
Pipeline #4625 passed
variables:
CONAN_VERSION: "2.4.1"
CONAN_VERSION: "2.6.0"
PYTHON_VERSION: "3.6.13"
workflow:
......
......@@ -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.
......@@ -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__))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment