From 75ed9cfb5f5cbc0bd2995943f180e59728f2e3f1 Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Tue, 18 Jun 2024 14:43:36 +0200 Subject: [PATCH] Update to Conan 2.4.1 and Cmake 3.29.6 --- README.md | 6 +-- conan-el6-gcc44-x86/.gitlab-ci.yml | 4 +- conan-el6-gcc44-x86/Dockerfile | 8 ++-- conan-el6-gcc44/.gitlab-ci.yml | 4 +- conan-el6-gcc44/Dockerfile | 8 ++-- conan-el6-gcc73-x86/.gitlab-ci.yml | 4 +- conan-el6-gcc73-x86/Dockerfile | 8 ++-- conan-el6-gcc73/.gitlab-ci.yml | 4 +- conan-el6-gcc73/Dockerfile | 8 ++-- conan-el6-gcc83-x86/.gitlab-ci.yml | 4 +- conan-el6-gcc83-x86/Dockerfile | 8 ++-- conan-el6-gcc83/.gitlab-ci.yml | 4 +- conan-el6-gcc83/Dockerfile | 8 ++-- conan-el6-gcc91-x86/.gitlab-ci.yml | 4 +- conan-el6-gcc91-x86/Dockerfile | 8 ++-- conan-el6-gcc91/.gitlab-ci.yml | 4 +- conan-el6-gcc91/Dockerfile | 8 ++-- conan-el7-gcc48-x86/.gitlab-ci.yml | 4 +- conan-el7-gcc48-x86/Dockerfile | 8 ++-- conan-el7-gcc48/.gitlab-ci.yml | 4 +- conan-el7-gcc48/Dockerfile | 6 +-- conan-el7-gcc73-x86/.gitlab-ci.yml | 4 +- conan-el7-gcc73-x86/Dockerfile | 8 ++-- conan-el7-gcc73/.gitlab-ci.yml | 4 +- conan-el7-gcc73/Dockerfile | 6 +-- conan-el7-gcc82-x86/.gitlab-ci.yml | 4 +- conan-el7-gcc82-x86/Dockerfile | 8 ++-- conan-el7-gcc83/.gitlab-ci.yml | 4 +- conan-el7-gcc83/Dockerfile | 6 +-- conan-el7-gcc93-x86/.gitlab-ci.yml | 4 +- conan-el7-gcc93-x86/Dockerfile | 8 ++-- conan-el7-gcc93/.gitlab-ci.yml | 4 +- conan-el7-gcc93/Dockerfile | 6 +-- dependencies.dot | 72 +++++++++++++++--------------- 34 files changed, 131 insertions(+), 131 deletions(-) diff --git a/README.md b/README.md index 9377ed5..fd7829c 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,8 @@ Based on https://github.com/conan-io/conan-docker-tools to build Docker images for Soleil environments All images include: -- Conan 2.0.17 with Python 3.6.13 -- Cmake 3.28.3 +- Conan 2.4.1 with Python 3.6.13 +- Cmake 3.29.6 - Git 2.39.2 | Image | OS | Arch | GCC | @@ -43,7 +43,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.17 -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.4.1 -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 5d9ce97..8deb256 100644 --- a/conan-el6-gcc44-x86/.gitlab-ci.yml +++ b/conan-el6-gcc44-x86/.gitlab-ci.yml @@ -28,10 +28,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index 4742362..bc46b16 100644 --- a/conan-el6-gcc44-x86/Dockerfile +++ b/conan-el6-gcc44-x86/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \ && 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.17/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml index 877841c..45765c9 100644 --- a/conan-el6-gcc44/.gitlab-ci.yml +++ b/conan-el6-gcc44/.gitlab-ci.yml @@ -28,10 +28,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.4" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile index 587e3f6..801ca3f 100644 --- a/conan-el6-gcc44/Dockerfile +++ b/conan-el6-gcc44/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-x86_64 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-x86_64 \ && 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.17/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.4.1/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml index 887724f..d11288b 100644 --- a/conan-el6-gcc73-x86/.gitlab-ci.yml +++ b/conan-el6-gcc73-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile index b5952a2..5f00fd8 100755 --- a/conan-el6-gcc73-x86/Dockerfile +++ b/conan-el6-gcc73-x86/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \ && 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.17/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml index 78b2b8f..de87f4a 100644 --- a/conan-el6-gcc73/.gitlab-ci.yml +++ b/conan-el6-gcc73/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile index c58e7c9..92d2baa 100755 --- a/conan-el6-gcc73/Dockerfile +++ b/conan-el6-gcc73/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-x86_64 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-x86_64 \ && 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.17/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.4.1/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml index ef26d1a..49180f0 100644 --- a/conan-el6-gcc83-x86/.gitlab-ci.yml +++ b/conan-el6-gcc83-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile index 7064fb4..8749a9f 100755 --- a/conan-el6-gcc83-x86/Dockerfile +++ b/conan-el6-gcc83-x86/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \ && 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.17/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml index b942f35..d0162db 100644 --- a/conan-el6-gcc83/.gitlab-ci.yml +++ b/conan-el6-gcc83/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile index 6fac064..f216634 100755 --- a/conan-el6-gcc83/Dockerfile +++ b/conan-el6-gcc83/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-x86_64 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-x86_64 \ && 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.17/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.4.1/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml index 15a3d0b..99ee43c 100644 --- a/conan-el6-gcc91-x86/.gitlab-ci.yml +++ b/conan-el6-gcc91-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile index f151400..581cb56 100755 --- a/conan-el6-gcc91-x86/Dockerfile +++ b/conan-el6-gcc91-x86/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \ && 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.17/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml index 84b49ab..2e1bad8 100644 --- a/conan-el6-gcc91/.gitlab-ci.yml +++ b/conan-el6-gcc91/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS release 6" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.1" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile index a1360bc..0d58280 100755 --- a/conan-el6-gcc91/Dockerfile +++ b/conan-el6-gcc91/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-x86_64 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-x86_64 \ && 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.17/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.4.1/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml index a85a9dc..ae4cbb8 100644 --- a/conan-el7-gcc48-x86/.gitlab-ci.yml +++ b/conan-el7-gcc48-x86/.gitlab-ci.yml @@ -28,10 +28,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile index 9c40ec7..e06477a 100755 --- a/conan-el7-gcc48-x86/Dockerfile +++ b/conan-el7-gcc48-x86/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \ && 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.17/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml index a68766d..6dbb6be 100644 --- a/conan-el7-gcc48/.gitlab-ci.yml +++ b/conan-el7-gcc48/.gitlab-ci.yml @@ -28,10 +28,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 4\.8" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile index e2f0f1c..87002f0 100755 --- a/conan-el7-gcc48/Dockerfile +++ b/conan-el7-gcc48/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -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.17/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.4.1/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml index 83b91d1..2ef1820 100644 --- a/conan-el7-gcc73-x86/.gitlab-ci.yml +++ b/conan-el7-gcc73-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile index 446c1c5..3a98e52 100755 --- a/conan-el7-gcc73-x86/Dockerfile +++ b/conan-el7-gcc73-x86/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \ && 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.17/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml index cf0ba37..01536cd 100644 --- a/conan-el7-gcc73/.gitlab-ci.yml +++ b/conan-el7-gcc73/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 7\.3" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile index 5ed3c33..f6589ba 100755 --- a/conan-el7-gcc73/Dockerfile +++ b/conan-el7-gcc73/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -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.17/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.4.1/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml index 565bfcd..fc2e0c9 100644 --- a/conan-el7-gcc82-x86/.gitlab-ci.yml +++ b/conan-el7-gcc82-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.2" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile index ac58927..f12074a 100755 --- a/conan-el7-gcc82-x86/Dockerfile +++ b/conan-el7-gcc82-x86/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \ && 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.17/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml index 6d147b4..69de9f6 100644 --- a/conan-el7-gcc83/.gitlab-ci.yml +++ b/conan-el7-gcc83/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 8\.3" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile index c54c9e6..e6aa444 100755 --- a/conan-el7-gcc83/Dockerfile +++ b/conan-el7-gcc83/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -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.17/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.4.1/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml index f10a299..ac880fd 100644 --- a/conan-el7-gcc93-x86/.gitlab-ci.yml +++ b/conan-el7-gcc93-x86/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} uname -m | grep "i686" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile index a7e19fa..2e77226 100755 --- a/conan-el7-gcc93-x86/Dockerfile +++ b/conan-el7-gcc93-x86/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -38,11 +38,11 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake - && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.28.3/download?job=linux-i686 \ + && curl -s -L -o ${CMAKE_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/cmake/-/jobs/artifacts/3.29.6/download?job=linux-i686 \ && 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.17/download?job=linux-i686 \ + && curl -s -L -o ${CONAN_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/conan/-/jobs/artifacts/2.4.1/download?job=linux-i686 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml index a4b5de5..38c5d07 100644 --- a/conan-el7-gcc93/.gitlab-ci.yml +++ b/conan-el7-gcc93/.gitlab-ci.yml @@ -27,10 +27,10 @@ test: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/centos-release | grep "CentOS Linux release 7" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 9\.3" - - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.28.3" + - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.29.6" - 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.17" + - docker run --rm ${CONTAINER_TEST_IMAGE} conan --version | grep "2.4.1" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version - docker run --rm ${CONTAINER_TEST_IMAGE} yq --version diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile index cb97618..6e59ed5 100755 --- a/conan-el7-gcc93/Dockerfile +++ b/conan-el7-gcc93/Dockerfile @@ -3,8 +3,8 @@ 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.17 \ - CMAKE_VERSION=3.28.3 \ + CONAN_VERSION=2.4.1 \ + CMAKE_VERSION=3.29.6 \ GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ @@ -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.17/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.4.1/download?job=linux-x86_64 \ && unzip -q ${CONAN_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${CONAN_ROOT}.zip \ # Install other tools diff --git a/dependencies.dot b/dependencies.dot index c8042bb..f676f39 100644 --- a/dependencies.dot +++ b/dependencies.dot @@ -60,10 +60,10 @@ digraph CentOS_conan { "git-2.39.2-linux-x86_64" "git-2.39.2-linux-i686" - "cmake-3.28.3-linux-i686" + "cmake-3.29.6-linux-i686" - "conan-2.0.17-linux-x86_64" - "conan-2.0.17-linux-i686" + "conan-2.4.1-linux-x86_64" + "conan-2.4.1-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"} @@ -129,11 +129,11 @@ digraph CentOS_conan { "conan-el6-gcc91" -> "python-3.6.13-linux-x86_64" "conan-el6-gcc91-x86" -> "python-3.6.13-linux-i686" - "dev-el6-gcc73-x86" -> "cmake-3.28.3-linux-i686" - "dev-el7-gcc73-x86" -> "cmake-3.28.3-linux-i686" + "dev-el6-gcc73-x86" -> "cmake-3.29.6-linux-i686" + "dev-el7-gcc73-x86" -> "cmake-3.29.6-linux-i686" - "python-3.6.13-linux-x86_64" -> "conan-2.0.17-linux-x86_64" - "python-3.6.13-linux-i686" -> "conan-2.0.17-linux-i686" + "python-3.6.13-linux-x86_64" -> "conan-2.4.1-linux-x86_64" + "python-3.6.13-linux-i686" -> "conan-2.4.1-linux-i686" "python-3.6.13-linux-x86_64" -> "conan-el6-gcc44" "python-3.6.13-linux-x86_64" -> "conan-el6-gcc73" @@ -175,33 +175,33 @@ digraph CentOS_conan { "git-2.39.2-linux-i686" -> "conan-el7-gcc82-x86" "git-2.39.2-linux-i686" -> "conan-el7-gcc93-x86" - "cmake-3.28.3-linux-i686" -> "conan-el6-gcc44-x86" - "cmake-3.28.3-linux-i686" -> "conan-el6-gcc73-x86" - "cmake-3.28.3-linux-i686" -> "conan-el6-gcc83-x86" - "cmake-3.28.3-linux-i686" -> "conan-el6-gcc91-x86" - - "cmake-3.28.3-linux-i686" -> "conan-el7-gcc48-x86" - "cmake-3.28.3-linux-i686" -> "conan-el7-gcc73-x86" - "cmake-3.28.3-linux-i686" -> "conan-el7-gcc82-x86" - "cmake-3.28.3-linux-i686" -> "conan-el7-gcc93-x86" - - "conan-2.0.17-linux-x86_64" -> "conan-el6-gcc44" - "conan-2.0.17-linux-x86_64" -> "conan-el6-gcc73" - "conan-2.0.17-linux-x86_64" -> "conan-el6-gcc83" - "conan-2.0.17-linux-x86_64" -> "conan-el6-gcc91" - - "conan-2.0.17-linux-i686" -> "conan-el6-gcc44-x86" - "conan-2.0.17-linux-i686" -> "conan-el6-gcc73-x86" - "conan-2.0.17-linux-i686" -> "conan-el6-gcc83-x86" - "conan-2.0.17-linux-i686" -> "conan-el6-gcc91-x86" - - "conan-2.0.17-linux-x86_64" -> "conan-el7-gcc48" - "conan-2.0.17-linux-x86_64" -> "conan-el7-gcc73" - "conan-2.0.17-linux-x86_64" -> "conan-el7-gcc83" - "conan-2.0.17-linux-x86_64" -> "conan-el7-gcc93" - - "conan-2.0.17-linux-i686" -> "conan-el7-gcc48-x86" - "conan-2.0.17-linux-i686" -> "conan-el7-gcc73-x86" - "conan-2.0.17-linux-i686" -> "conan-el7-gcc82-x86" - "conan-2.0.17-linux-i686" -> "conan-el7-gcc93-x86" + "cmake-3.29.6-linux-i686" -> "conan-el6-gcc44-x86" + "cmake-3.29.6-linux-i686" -> "conan-el6-gcc73-x86" + "cmake-3.29.6-linux-i686" -> "conan-el6-gcc83-x86" + "cmake-3.29.6-linux-i686" -> "conan-el6-gcc91-x86" + + "cmake-3.29.6-linux-i686" -> "conan-el7-gcc48-x86" + "cmake-3.29.6-linux-i686" -> "conan-el7-gcc73-x86" + "cmake-3.29.6-linux-i686" -> "conan-el7-gcc82-x86" + "cmake-3.29.6-linux-i686" -> "conan-el7-gcc93-x86" + + "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc44" + "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc73" + "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc83" + "conan-2.4.1-linux-x86_64" -> "conan-el6-gcc91" + + "conan-2.4.1-linux-i686" -> "conan-el6-gcc44-x86" + "conan-2.4.1-linux-i686" -> "conan-el6-gcc73-x86" + "conan-2.4.1-linux-i686" -> "conan-el6-gcc83-x86" + "conan-2.4.1-linux-i686" -> "conan-el6-gcc91-x86" + + "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc48" + "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc73" + "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc83" + "conan-2.4.1-linux-x86_64" -> "conan-el7-gcc93" + + "conan-2.4.1-linux-i686" -> "conan-el7-gcc48-x86" + "conan-2.4.1-linux-i686" -> "conan-el7-gcc73-x86" + "conan-2.4.1-linux-i686" -> "conan-el7-gcc82-x86" + "conan-2.4.1-linux-i686" -> "conan-el7-gcc93-x86" } -- GitLab