From 9cac8ade3754cac85e61bde959b9eada188b25ea Mon Sep 17 00:00:00 2001 From: MADELA Patrick <patrick.madela@synchrotron-soleil.fr> Date: Sun, 10 Sep 2023 18:43:35 +0200 Subject: [PATCH] Roolback to Git 2.39.2, compatibility issue with Jenkins, choose to use the same version than Windows --- README.md | 2 +- 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, 72 insertions(+), 72 deletions(-) diff --git a/README.md b/README.md index 4e8466c..8d8551c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Based on https://github.com/conan-io/conan-docker-tools to build Docker images f All images include: - Conan 2.0.10 with Python 3.6.13 - Cmake 3.27.4 -- Git 2.42.0 +- Git 2.39.2 | Image | OS | Arch | GCC | | ------------------- | -------------- | ------- | --------------------------------------------| diff --git a/conan-el6-gcc44-x86/.gitlab-ci.yml b/conan-el6-gcc44-x86/.gitlab-ci.yml index 12d7000..12195e1 100644 --- a/conan-el6-gcc44-x86/.gitlab-ci.yml +++ b/conan-el6-gcc44-x86/.gitlab-ci.yml @@ -29,7 +29,7 @@ test: - 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.27.4" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el6-gcc44-x86/Dockerfile b/conan-el6-gcc44-x86/Dockerfile index b6f267a..986b40b 100644 --- a/conan-el6-gcc44-x86/Dockerfile +++ b/conan-el6-gcc44-x86/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el6-gcc44/.gitlab-ci.yml b/conan-el6-gcc44/.gitlab-ci.yml index f5eaa62..814b718 100644 --- a/conan-el6-gcc44/.gitlab-ci.yml +++ b/conan-el6-gcc44/.gitlab-ci.yml @@ -29,7 +29,7 @@ test: - 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.27.4" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el6-gcc44/Dockerfile b/conan-el6-gcc44/Dockerfile index 8d43a6c..40089eb 100644 --- a/conan-el6-gcc44/Dockerfile +++ b/conan-el6-gcc44/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) diff --git a/conan-el6-gcc73-x86/.gitlab-ci.yml b/conan-el6-gcc73-x86/.gitlab-ci.yml index 988615e..6f010e6 100644 --- a/conan-el6-gcc73-x86/.gitlab-ci.yml +++ b/conan-el6-gcc73-x86/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el6-gcc73-x86/Dockerfile b/conan-el6-gcc73-x86/Dockerfile index 28e428a..dde36cb 100755 --- a/conan-el6-gcc73-x86/Dockerfile +++ b/conan-el6-gcc73-x86/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el6-gcc73/.gitlab-ci.yml b/conan-el6-gcc73/.gitlab-ci.yml index d103b2d..fb2723f 100644 --- a/conan-el6-gcc73/.gitlab-ci.yml +++ b/conan-el6-gcc73/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el6-gcc73/Dockerfile b/conan-el6-gcc73/Dockerfile index ea89694..4a19f48 100755 --- a/conan-el6-gcc73/Dockerfile +++ b/conan-el6-gcc73/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) diff --git a/conan-el6-gcc83-x86/.gitlab-ci.yml b/conan-el6-gcc83-x86/.gitlab-ci.yml index 914d7d1..c8608c5 100644 --- a/conan-el6-gcc83-x86/.gitlab-ci.yml +++ b/conan-el6-gcc83-x86/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el6-gcc83-x86/Dockerfile b/conan-el6-gcc83-x86/Dockerfile index 612be8d..1afdb6d 100755 --- a/conan-el6-gcc83-x86/Dockerfile +++ b/conan-el6-gcc83-x86/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el6-gcc83/.gitlab-ci.yml b/conan-el6-gcc83/.gitlab-ci.yml index 9efaa58..b176336 100644 --- a/conan-el6-gcc83/.gitlab-ci.yml +++ b/conan-el6-gcc83/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el6-gcc83/Dockerfile b/conan-el6-gcc83/Dockerfile index fc800d1..c359fec 100755 --- a/conan-el6-gcc83/Dockerfile +++ b/conan-el6-gcc83/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) diff --git a/conan-el6-gcc91-x86/.gitlab-ci.yml b/conan-el6-gcc91-x86/.gitlab-ci.yml index 5e40646..ae60380 100644 --- a/conan-el6-gcc91-x86/.gitlab-ci.yml +++ b/conan-el6-gcc91-x86/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el6-gcc91-x86/Dockerfile b/conan-el6-gcc91-x86/Dockerfile index 8531eea..fa07572 100755 --- a/conan-el6-gcc91-x86/Dockerfile +++ b/conan-el6-gcc91-x86/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el6-gcc91/.gitlab-ci.yml b/conan-el6-gcc91/.gitlab-ci.yml index 03b938b..eb1c3f3 100644 --- a/conan-el6-gcc91/.gitlab-ci.yml +++ b/conan-el6-gcc91/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el6-gcc91/Dockerfile b/conan-el6-gcc91/Dockerfile index 61aa1f2..1900cf7 100755 --- a/conan-el6-gcc91/Dockerfile +++ b/conan-el6-gcc91/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd 1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake from binaries distribution to get recent version without compilation (compilation needs c++11) diff --git a/conan-el7-gcc48-x86/.gitlab-ci.yml b/conan-el7-gcc48-x86/.gitlab-ci.yml index 6d77a0c..a13fd9a 100644 --- a/conan-el7-gcc48-x86/.gitlab-ci.yml +++ b/conan-el7-gcc48-x86/.gitlab-ci.yml @@ -29,7 +29,7 @@ test: - 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.27.4" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el7-gcc48-x86/Dockerfile b/conan-el7-gcc48-x86/Dockerfile index 286479b..b87940e 100755 --- a/conan-el7-gcc48-x86/Dockerfile +++ b/conan-el7-gcc48-x86/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc48/.gitlab-ci.yml b/conan-el7-gcc48/.gitlab-ci.yml index c72573a..738b438 100644 --- a/conan-el7-gcc48/.gitlab-ci.yml +++ b/conan-el7-gcc48/.gitlab-ci.yml @@ -29,7 +29,7 @@ test: - 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.27.4" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el7-gcc48/Dockerfile b/conan-el7-gcc48/Dockerfile index e267123..97f68d9 100755 --- a/conan-el7-gcc48/Dockerfile +++ b/conan-el7-gcc48/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc73-x86/.gitlab-ci.yml b/conan-el7-gcc73-x86/.gitlab-ci.yml index 5a094ec..552763d 100644 --- a/conan-el7-gcc73-x86/.gitlab-ci.yml +++ b/conan-el7-gcc73-x86/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el7-gcc73-x86/Dockerfile b/conan-el7-gcc73-x86/Dockerfile index be8cfa5..a5df02d 100755 --- a/conan-el7-gcc73-x86/Dockerfile +++ b/conan-el7-gcc73-x86/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc73/.gitlab-ci.yml b/conan-el7-gcc73/.gitlab-ci.yml index 4256162..6ff06d3 100644 --- a/conan-el7-gcc73/.gitlab-ci.yml +++ b/conan-el7-gcc73/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el7-gcc73/Dockerfile b/conan-el7-gcc73/Dockerfile index 0bee2c7..00a0b17 100755 --- a/conan-el7-gcc73/Dockerfile +++ b/conan-el7-gcc73/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc82-x86/.gitlab-ci.yml b/conan-el7-gcc82-x86/.gitlab-ci.yml index 4c98f34..1676899 100644 --- a/conan-el7-gcc82-x86/.gitlab-ci.yml +++ b/conan-el7-gcc82-x86/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el7-gcc82-x86/Dockerfile b/conan-el7-gcc82-x86/Dockerfile index a998d55..6888a77 100755 --- a/conan-el7-gcc82-x86/Dockerfile +++ b/conan-el7-gcc82-x86/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc83/.gitlab-ci.yml b/conan-el7-gcc83/.gitlab-ci.yml index f335c01..389ab52 100644 --- a/conan-el7-gcc83/.gitlab-ci.yml +++ b/conan-el7-gcc83/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el7-gcc83/Dockerfile b/conan-el7-gcc83/Dockerfile index dcea4d5..780047f 100755 --- a/conan-el7-gcc83/Dockerfile +++ b/conan-el7-gcc83/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc93-x86/.gitlab-ci.yml b/conan-el7-gcc93-x86/.gitlab-ci.yml index 96b1c9d..af36a04 100644 --- a/conan-el7-gcc93-x86/.gitlab-ci.yml +++ b/conan-el7-gcc93-x86/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm --platform=linux/386 ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el7-gcc93-x86/Dockerfile b/conan-el7-gcc93-x86/Dockerfile index 8bcc7eb..e1d7381 100755 --- a/conan-el7-gcc93-x86/Dockerfile +++ b/conan-el7-gcc93-x86/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=i686 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-i686 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-i686 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/conan-el7-gcc93/.gitlab-ci.yml b/conan-el7-gcc93/.gitlab-ci.yml index b78fec3..e7a2ec7 100644 --- a/conan-el7-gcc93/.gitlab-ci.yml +++ b/conan-el7-gcc93/.gitlab-ci.yml @@ -28,7 +28,7 @@ test: - 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.27.4" - - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.42.0" + - 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.10" - docker run --rm ${CONTAINER_TEST_IMAGE} jq --version diff --git a/conan-el7-gcc93/Dockerfile b/conan-el7-gcc93/Dockerfile index 81a4dab..98b9eab 100755 --- a/conan-el7-gcc93/Dockerfile +++ b/conan-el7-gcc93/Dockerfile @@ -5,7 +5,7 @@ LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" ARG PYTHON_VERSION=3.6.13 \ CONAN_VERSION=2.0.10 \ CMAKE_VERSION=3.27.4 \ - GIT_VERSION=2.42.0 \ + GIT_VERSION=2.39.2 \ DEVTOOLS_ROOT=/usr/Local/devtools \ OS=linux \ ARCH=x86_64 @@ -34,7 +34,7 @@ RUN groupadd g1001 -g 1001 \ && unzip -q ${PYTHON_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${PYTHON_ROOT}.zip \ # Install git - && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.42.0/download?job=linux-x86_64 \ + && curl -s -L -o ${GIT_ROOT}.zip https://gitlab.synchrotron-soleil.fr/software-control-system/devtools/git/-/jobs/artifacts/2.39.2/download?job=linux-x86_64 \ && unzip -q ${GIT_ROOT}.zip -d ${DEVTOOLS_ROOT} \ && rm ${GIT_ROOT}.zip \ # Install cmake diff --git a/dependencies.dot b/dependencies.dot index bdc8f19..03c81b4 100644 --- a/dependencies.dot +++ b/dependencies.dot @@ -57,8 +57,8 @@ digraph CentOS_conan { "python-3.6.13-linux-x86_64" "python-3.6.13-linux-i686" - "git-2.42.0-linux-x86_64" - "git-2.42.0-linux-i686" + "git-2.39.2-linux-x86_64" + "git-2.39.2-linux-i686" "cmake-3.27.4-linux-i686" @@ -123,8 +123,8 @@ digraph CentOS_conan { # Use edge [dir=back arrowtail=vee] - "conan-el6-gcc91" -> "git-2.42.0-linux-x86_64" - "conan-el6-gcc91-x86" -> "git-2.42.0-linux-i686" + "conan-el6-gcc91" -> "git-2.39.2-linux-x86_64" + "conan-el6-gcc91-x86" -> "git-2.39.2-linux-i686" "conan-el6-gcc91" -> "python-3.6.13-linux-x86_64" "conan-el6-gcc91-x86" -> "python-3.6.13-linux-i686" @@ -155,25 +155,25 @@ digraph CentOS_conan { "python-3.6.13-linux-i686" -> "conan-el7-gcc82-x86" "python-3.6.13-linux-i686" -> "conan-el7-gcc93-x86" - "git-2.42.0-linux-x86_64" -> "conan-el6-gcc44" - "git-2.42.0-linux-x86_64" -> "conan-el6-gcc73" - "git-2.42.0-linux-x86_64" -> "conan-el6-gcc83" - "git-2.42.0-linux-x86_64" -> "conan-el6-gcc91" - - "git-2.42.0-linux-i686" -> "conan-el6-gcc44-x86" - "git-2.42.0-linux-i686" -> "conan-el6-gcc73-x86" - "git-2.42.0-linux-i686" -> "conan-el6-gcc83-x86" - "git-2.42.0-linux-i686" -> "conan-el6-gcc91-x86" - - "git-2.42.0-linux-x86_64" -> "conan-el7-gcc48" - "git-2.42.0-linux-x86_64" -> "conan-el7-gcc73" - "git-2.42.0-linux-x86_64" -> "conan-el7-gcc83" - "git-2.42.0-linux-x86_64" -> "conan-el7-gcc93" - - "git-2.42.0-linux-i686" -> "conan-el7-gcc48-x86" - "git-2.42.0-linux-i686" -> "conan-el7-gcc73-x86" - "git-2.42.0-linux-i686" -> "conan-el7-gcc82-x86" - "git-2.42.0-linux-i686" -> "conan-el7-gcc93-x86" + "git-2.39.2-linux-x86_64" -> "conan-el6-gcc44" + "git-2.39.2-linux-x86_64" -> "conan-el6-gcc73" + "git-2.39.2-linux-x86_64" -> "conan-el6-gcc83" + "git-2.39.2-linux-x86_64" -> "conan-el6-gcc91" + + "git-2.39.2-linux-i686" -> "conan-el6-gcc44-x86" + "git-2.39.2-linux-i686" -> "conan-el6-gcc73-x86" + "git-2.39.2-linux-i686" -> "conan-el6-gcc83-x86" + "git-2.39.2-linux-i686" -> "conan-el6-gcc91-x86" + + "git-2.39.2-linux-x86_64" -> "conan-el7-gcc48" + "git-2.39.2-linux-x86_64" -> "conan-el7-gcc73" + "git-2.39.2-linux-x86_64" -> "conan-el7-gcc83" + "git-2.39.2-linux-x86_64" -> "conan-el7-gcc93" + + "git-2.39.2-linux-i686" -> "conan-el7-gcc48-x86" + "git-2.39.2-linux-i686" -> "conan-el7-gcc73-x86" + "git-2.39.2-linux-i686" -> "conan-el7-gcc82-x86" + "git-2.39.2-linux-i686" -> "conan-el7-gcc93-x86" "cmake-3.27.4-linux-i686" -> "conan-el6-gcc44-x86" "cmake-3.27.4-linux-i686" -> "conan-el6-gcc73-x86" -- GitLab