From b1af8a118eb6cb8b4300d32b983e308a2d741c44 Mon Sep 17 00:00:00 2001
From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr>
Date: Thu, 22 Jun 2023 14:13:06 +0200
Subject: [PATCH] Update to Conan 2.0.7
---
README.md | 4 +--
conan-el6-gcc44-x86/.gitlab-ci.yml | 2 +-
conan-el6-gcc44-x86/Dockerfile | 4 +--
conan-el6-gcc44/.gitlab-ci.yml | 2 +-
conan-el6-gcc44/Dockerfile | 4 +--
conan-el6-gcc73-x86/.gitlab-ci.yml | 2 +-
conan-el6-gcc73-x86/Dockerfile | 4 +--
conan-el6-gcc73/.gitlab-ci.yml | 2 +-
conan-el6-gcc73/Dockerfile | 4 +--
conan-el6-gcc83-x86/.gitlab-ci.yml | 2 +-
conan-el6-gcc83-x86/Dockerfile | 4 +--
conan-el6-gcc83/.gitlab-ci.yml | 2 +-
conan-el6-gcc83/Dockerfile | 4 +--
conan-el6-gcc91-x86/.gitlab-ci.yml | 2 +-
conan-el6-gcc91-x86/Dockerfile | 4 +--
conan-el6-gcc91/.gitlab-ci.yml | 2 +-
conan-el6-gcc91/Dockerfile | 4 +--
conan-el7-gcc48-x86/.gitlab-ci.yml | 2 +-
conan-el7-gcc48-x86/Dockerfile | 4 +--
conan-el7-gcc48/.gitlab-ci.yml | 2 +-
conan-el7-gcc48/Dockerfile | 4 +--
conan-el7-gcc73-x86/.gitlab-ci.yml | 2 +-
conan-el7-gcc73-x86/Dockerfile | 4 +--
conan-el7-gcc73/.gitlab-ci.yml | 2 +-
conan-el7-gcc73/Dockerfile | 4 +--
conan-el7-gcc82-x86/.gitlab-ci.yml | 2 +-
conan-el7-gcc82-x86/Dockerfile | 4 +--
conan-el7-gcc83/.gitlab-ci.yml | 2 +-
conan-el7-gcc83/Dockerfile | 4 +--
conan-el7-gcc93-x86/.gitlab-ci.yml | 2 +-
conan-el7-gcc93-x86/Dockerfile | 4 +--
conan-el7-gcc93/.gitlab-ci.yml | 2 +-
conan-el7-gcc93/Dockerfile | 4 +--
dependencies.dot | 46 +++++++++++++++---------------
34 files changed, 73 insertions(+), 73 deletions(-)
diff --git a/README.md b/README.md
index 2509183..8c4922c 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments
All images include:
-- Conan 2.0.5 with Python 3.6.13
+- Conan 2.0.7 with Python 3.6.13
- Cmake 3.26.2
- Git 2.39.2
@@ -49,7 +49,7 @@ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy
### To build image without docker-compose with specific version of Conan
```
-$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=2.0.5 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
+$ docker build --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy --build-arg CONAN_VERSION=2.0.7 -t conan-el6-gcc44 -f conan-el6-gcc44/Dockerfile .
```
## Launch
diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml
index 29806c8..158a083 100644
--- a/conan-el6-gcc44-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc44-x86/.gitlab-ci.yml
@@ -31,7 +31,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile
index ad7fe9a..3971d73 100644
--- a/conan-el6-gcc44-x86/Dockerfile
+++ b/conan-el6-gcc44-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml
index 28dcc64..5376a72 100644
--- a/conan-el6-gcc44/.gitlab-ci.yml
+++ b/conan-el6-gcc44/.gitlab-ci.yml
@@ -31,7 +31,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile
index 749af0a..9f790fc 100644
--- a/conan-el6-gcc44/Dockerfile
+++ b/conan-el6-gcc44/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml
index f2f618c..5713208 100644
--- a/conan-el6-gcc73-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc73-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile
index 1f0ab84..16d6428 100755
--- a/conan-el6-gcc73-x86/Dockerfile
+++ b/conan-el6-gcc73-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml
index de4d597..534f3e1 100644
--- a/conan-el6-gcc73/.gitlab-ci.yml
+++ b/conan-el6-gcc73/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile
index 9b618ca..b928e80 100755
--- a/conan-el6-gcc73/Dockerfile
+++ b/conan-el6-gcc73/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml
index 84b52d5..8dc029f 100644
--- a/conan-el6-gcc83-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc83-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile
index 3865cf6..c2b7af1 100755
--- a/conan-el6-gcc83-x86/Dockerfile
+++ b/conan-el6-gcc83-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml
index 21fe5fc..a3336e4 100644
--- a/conan-el6-gcc83/.gitlab-ci.yml
+++ b/conan-el6-gcc83/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile
index 9c73a4c..e2d5c44 100755
--- a/conan-el6-gcc83/Dockerfile
+++ b/conan-el6-gcc83/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml
index 5c59e1f..c8848ce 100644
--- a/conan-el6-gcc91-x86/.gitlab-ci.yml
+++ b/conan-el6-gcc91-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile
index 14ef2f3..c869d63 100755
--- a/conan-el6-gcc91-x86/Dockerfile
+++ b/conan-el6-gcc91-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -42,7 +42,7 @@ RUN groupadd 1001 -g 1001 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml
index ba27bcf..cf45b5d 100644
--- a/conan-el6-gcc91/.gitlab-ci.yml
+++ b/conan-el6-gcc91/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile
index 2ca9866..1cfadfe 100755
--- a/conan-el6-gcc91/Dockerfile
+++ b/conan-el6-gcc91/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -45,7 +45,7 @@ RUN groupadd 1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml
index 40751cd..8104a6c 100644
--- a/conan-el7-gcc48-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc48-x86/.gitlab-ci.yml
@@ -31,7 +31,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile
index 522a90e..37b6323 100755
--- a/conan-el7-gcc48-x86/Dockerfile
+++ b/conan-el7-gcc48-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml
index c7cf891..79fef8c 100644
--- a/conan-el7-gcc48/.gitlab-ci.yml
+++ b/conan-el7-gcc48/.gitlab-ci.yml
@@ -31,7 +31,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile
index 00d0c53..83d3fbf 100755
--- a/conan-el7-gcc48/Dockerfile
+++ b/conan-el7-gcc48/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml
index 5082eef..68da875 100644
--- a/conan-el7-gcc73-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc73-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile
index 5a622f4..07bd373 100755
--- a/conan-el7-gcc73-x86/Dockerfile
+++ b/conan-el7-gcc73-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml
index ed308ed..4c362ee 100644
--- a/conan-el7-gcc73/.gitlab-ci.yml
+++ b/conan-el7-gcc73/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile
index 087f0b8..30b0e5e 100755
--- a/conan-el7-gcc73/Dockerfile
+++ b/conan-el7-gcc73/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml
index a9be713..fa0d1de 100644
--- a/conan-el7-gcc82-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc82-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile
index d73119d..fcfdfb2 100755
--- a/conan-el7-gcc82-x86/Dockerfile
+++ b/conan-el7-gcc82-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml
index e78cd25..dcf34ac 100644
--- a/conan-el7-gcc83/.gitlab-ci.yml
+++ b/conan-el7-gcc83/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile
index fd7767d..c7d65fa 100755
--- a/conan-el7-gcc83/Dockerfile
+++ b/conan-el7-gcc83/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml
index 1e4054f..ff851c2 100644
--- a/conan-el7-gcc93-x86/.gitlab-ci.yml
+++ b/conan-el7-gcc93-x86/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile
index 0de79ab..0434c5c 100755
--- a/conan-el7-gcc93-x86/Dockerfile
+++ b/conan-el7-gcc93-x86/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -42,7 +42,7 @@ RUN groupadd g1001 -g 1001 \
&& unzip -q ${CMAKE_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CMAKE_ROOT}.zip \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-i686 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-i686 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip \
# Force to use linux32 when Jenkins uses docker exec ... sh -c "..."
diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml
index 0cd17d5..957f078 100644
--- a/conan-el7-gcc93/.gitlab-ci.yml
+++ b/conan-el7-gcc93/.gitlab-ci.yml
@@ -30,7 +30,7 @@ test:
- docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.26.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2"
- docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13"
- - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.5"
+ - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.7"
release:
stage: release
diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile
index 3a1f3dd..9afe15a 100755
--- a/conan-el7-gcc93/Dockerfile
+++ b/conan-el7-gcc93/Dockerfile
@@ -3,7 +3,7 @@ FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/de
LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr"
ARG PYTHON_VERSION=3.6.13 \
- CONAN_VERSION=2.0.5 \
+ CONAN_VERSION=2.0.7 \
CMAKE_VERSION=3.26.2 \
GIT_VERSION=2.39.2 \
DEVTOOLS_ROOT=/usr/Local/devtools \
@@ -45,7 +45,7 @@ RUN groupadd g1001 -g 1001 \
--exclude=share/cmake-${CMAKE_VERSION_MAJOR_MINOR}/Help \
--exclude=share/vim \
# Install conan
- && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.5/download?job=linux-x86_64 \
+ && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.0.7/download?job=linux-x86_64 \
&& unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \
&& rm ${CONAN_ROOT}.zip
diff --git a/dependencies.dot b/dependencies.dot
index 2a84186..d53fa76 100644
--- a/dependencies.dot
+++ b/dependencies.dot
@@ -62,8 +62,8 @@ digraph CentOS_conan {
"cmake-3.26.2-linux-i686"
- "conan-2.0.5-linux-x86_64"
- "conan-2.0.5-linux-i686"
+ "conan-2.0.7-linux-x86_64"
+ "conan-2.0.7-linux-i686"
{rank = same; "dev-el6-gcc44"; "dev-el6-gcc44-x86"; "dev-el7-gcc48"; "dev-el7-gcc48-x86"}
{rank = same; "dev-el6-gcc73"; "dev-el6-gcc83"; "dev-el6-gcc91"; "dev-el6-gcc73-x86"; "dev-el6-gcc83-x86"; "dev-el6-gcc91-x86"; "dev-el7-gcc73"; "dev-el7-gcc83"; "dev-el7-gcc93"; "dev-el7-gcc73-x86"; "dev-el7-gcc82-x86"; "dev-el7-gcc93-x86"}
@@ -132,8 +132,8 @@ digraph CentOS_conan {
"dev-el6-gcc73-x86" -> "cmake-3.26.2-linux-i686"
"dev-el7-gcc73-x86" -> "cmake-3.26.2-linux-i686"
- "python-3.6.13-linux-x86_64" -> "conan-2.0.5-linux-x86_64"
- "python-3.6.13-linux-i686" -> "conan-2.0.5-linux-i686"
+ "python-3.6.13-linux-x86_64" -> "conan-2.0.7-linux-x86_64"
+ "python-3.6.13-linux-i686" -> "conan-2.0.7-linux-i686"
"python-3.6.13-linux-x86_64" -> "conan-el6-gcc44"
"python-3.6.13-linux-x86_64" -> "conan-el6-gcc73"
@@ -185,23 +185,23 @@ digraph CentOS_conan {
"cmake-3.26.2-linux-i686" -> "conan-el7-gcc82-x86"
"cmake-3.26.2-linux-i686" -> "conan-el7-gcc93-x86"
- "conan-2.0.5-linux-x86_64" -> "conan-el6-gcc44"
- "conan-2.0.5-linux-x86_64" -> "conan-el6-gcc73"
- "conan-2.0.5-linux-x86_64" -> "conan-el6-gcc83"
- "conan-2.0.5-linux-x86_64" -> "conan-el6-gcc91"
-
- "conan-2.0.5-linux-i686" -> "conan-el6-gcc44-x86"
- "conan-2.0.5-linux-i686" -> "conan-el6-gcc73-x86"
- "conan-2.0.5-linux-i686" -> "conan-el6-gcc83-x86"
- "conan-2.0.5-linux-i686" -> "conan-el6-gcc91-x86"
-
- "conan-2.0.5-linux-x86_64" -> "conan-el7-gcc48"
- "conan-2.0.5-linux-x86_64" -> "conan-el7-gcc73"
- "conan-2.0.5-linux-x86_64" -> "conan-el7-gcc83"
- "conan-2.0.5-linux-x86_64" -> "conan-el7-gcc93"
-
- "conan-2.0.5-linux-i686" -> "conan-el7-gcc48-x86"
- "conan-2.0.5-linux-i686" -> "conan-el7-gcc73-x86"
- "conan-2.0.5-linux-i686" -> "conan-el7-gcc82-x86"
- "conan-2.0.5-linux-i686" -> "conan-el7-gcc93-x86"
+ "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc44"
+ "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc73"
+ "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc83"
+ "conan-2.0.7-linux-x86_64" -> "conan-el6-gcc91"
+
+ "conan-2.0.7-linux-i686" -> "conan-el6-gcc44-x86"
+ "conan-2.0.7-linux-i686" -> "conan-el6-gcc73-x86"
+ "conan-2.0.7-linux-i686" -> "conan-el6-gcc83-x86"
+ "conan-2.0.7-linux-i686" -> "conan-el6-gcc91-x86"
+
+ "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc48"
+ "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc73"
+ "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc83"
+ "conan-2.0.7-linux-x86_64" -> "conan-el7-gcc93"
+
+ "conan-2.0.7-linux-i686" -> "conan-el7-gcc48-x86"
+ "conan-2.0.7-linux-i686" -> "conan-el7-gcc73-x86"
+ "conan-2.0.7-linux-i686" -> "conan-el7-gcc82-x86"
+ "conan-2.0.7-linux-i686" -> "conan-el7-gcc93-x86"
}
--
GitLab