From c60b49d1f771ea72def03e328b92e938f21d6bad Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Wed, 3 May 2023 15:08:30 +0200 Subject: [PATCH] Update to conan 2.0.4 --- 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 f59d11f..66fcf09 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.3 with Python 3.6.13 +- Conan 2.0.4 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.3 -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.4 -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 99d6ac4..2e81884 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.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index 78f7cca..7b35e50 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 648558b..cb16958 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.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile index 700999c..12b9973 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 f839e21..80ab8a3 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.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile index 0483aed..29a02cd 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 66aa412..e257f87 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.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile index 4183f99..d077b74 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 efdfbb3..4484c2c 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.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile index b0975d0..2862798 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 b31b360..5abec77 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.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile index 2e7acdb..363cf77 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 42626e7..e0024ed 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.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile index 6c950df..e32078b 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 dba41d1..511ad8f 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.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile index 3d7148e..9d25918 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 5cd941c..d838270 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.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile index 0abfcce..a03bcd8 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 969428f..3dc3a93 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.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile index 6fd7931..224591b 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 7ef5980..e380308 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.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile index 4fff7bc..7e0efb0 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 8ada338..b613b34 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.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile index fef2101..11b436f 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 d9566fa..cfeebdc 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.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile index eeb0aea..15dfd5f 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 6c082b3..8b45a24 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.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile index bc252b3..8f987d0 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 baeedf7..3a073a6 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.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile index d8fae28..982de3a 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 1000696..6503d11 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.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.0.4" release: stage: release diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile index da9e1ca..c06322a 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.3 \ + CONAN_VERSION=2.0.4 \ 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.3/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.4/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 11d770d..d63dde8 100644 --- a/dependencies.dot +++ b/dependencies.dot @@ -62,8 +62,8 @@ digraph CentOS_conan { "cmake-3.26.2-linux-i686" - "conan-2.0.3-linux-x86_64" - "conan-2.0.3-linux-i686" + "conan-2.0.4-linux-x86_64" + "conan-2.0.4-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.3-linux-x86_64" - "python-3.6.13-linux-i686" -> "conan-2.0.3-linux-i686" + "python-3.6.13-linux-x86_64" -> "conan-2.0.4-linux-x86_64" + "python-3.6.13-linux-i686" -> "conan-2.0.4-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.3-linux-x86_64" -> "conan-el6-gcc44" - "conan-2.0.3-linux-x86_64" -> "conan-el6-gcc73" - "conan-2.0.3-linux-x86_64" -> "conan-el6-gcc83" - "conan-2.0.3-linux-x86_64" -> "conan-el6-gcc91" - - "conan-2.0.3-linux-i686" -> "conan-el6-gcc44-x86" - "conan-2.0.3-linux-i686" -> "conan-el6-gcc73-x86" - "conan-2.0.3-linux-i686" -> "conan-el6-gcc83-x86" - "conan-2.0.3-linux-i686" -> "conan-el6-gcc91-x86" - - "conan-2.0.3-linux-x86_64" -> "conan-el7-gcc48" - "conan-2.0.3-linux-x86_64" -> "conan-el7-gcc73" - "conan-2.0.3-linux-x86_64" -> "conan-el7-gcc83" - "conan-2.0.3-linux-x86_64" -> "conan-el7-gcc93" - - "conan-2.0.3-linux-i686" -> "conan-el7-gcc48-x86" - "conan-2.0.3-linux-i686" -> "conan-el7-gcc73-x86" - "conan-2.0.3-linux-i686" -> "conan-el7-gcc82-x86" - "conan-2.0.3-linux-i686" -> "conan-el7-gcc93-x86" + "conan-2.0.4-linux-x86_64" -> "conan-el6-gcc44" + "conan-2.0.4-linux-x86_64" -> "conan-el6-gcc73" + "conan-2.0.4-linux-x86_64" -> "conan-el6-gcc83" + "conan-2.0.4-linux-x86_64" -> "conan-el6-gcc91" + + "conan-2.0.4-linux-i686" -> "conan-el6-gcc44-x86" + "conan-2.0.4-linux-i686" -> "conan-el6-gcc73-x86" + "conan-2.0.4-linux-i686" -> "conan-el6-gcc83-x86" + "conan-2.0.4-linux-i686" -> "conan-el6-gcc91-x86" + + "conan-2.0.4-linux-x86_64" -> "conan-el7-gcc48" + "conan-2.0.4-linux-x86_64" -> "conan-el7-gcc73" + "conan-2.0.4-linux-x86_64" -> "conan-el7-gcc83" + "conan-2.0.4-linux-x86_64" -> "conan-el7-gcc93" + + "conan-2.0.4-linux-i686" -> "conan-el7-gcc48-x86" + "conan-2.0.4-linux-i686" -> "conan-el7-gcc73-x86" + "conan-2.0.4-linux-i686" -> "conan-el7-gcc82-x86" + "conan-2.0.4-linux-i686" -> "conan-el7-gcc93-x86" } -- GitLab