diff --git a/README.md b/README.md index 4e8466c2a085d1cfe364f06e59aad0a978644217..8d8551c3e525bfc0a5af10361f1cf061444676d7 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 12d700004a1684965caa6d74d4c43e7d26c0781b..12195e1d2a7d0458d01398264d63a05b82d238b1 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 b6f267a190520514bbb20c996ecc5cfaeec7e86d..986b40bdb873165ef29f4b3b63004a8176d36a23 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 f5eaa62d8c915c350528d26f88ee8a61f9290001..814b7183387a5a143dd08c947ed4f080bd9b0e09 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 8d43a6c58fd5061efdf96998a6bfd706b0562ed8..40089eb8f9ae98394cf83503311f36ce81a10135 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 988615e8f155b59c216b0335c047ee9c512362a6..6f010e6a2df387a973cf9cedc012aaccfe68d289 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 28e428af8a94761c219ed9dc183f9215955550b2..dde36cb76a4610050f0fa677e73d775689d8664d 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 d103b2d2e0700a101b264d5ef4eaf49da767d237..fb2723f125e540cb0549cae8ed9547b76342e227 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 ea89694861e226398c261b6be098a8c1650312d1..4a19f48c2cddfb8dc81cba9e25b07e59526b6cdc 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 914d7d11fc1085bbecc72228d4734c4be0e30060..c8608c50b76ef0d80019a98d1d4bdb18d5528b3b 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 612be8dcc14e8f743ac3eb7717617e96ed083e83..1afdb6d9800bb8c3fa543a1e23ce49aa89ad2356 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 9efaa588cce22a2660db4702cc166b567ff10847..b176336d4c88328255f249dd0b315a7c3151fcc2 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 fc800d1aaa7f9d63a29d543bfa69327b0c129f01..c359fecfc22f426c899be438cff7268506bd65a5 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 5e40646b9dab6fd0659905c8d2a68c55a1ba2abe..ae60380198fb753778f72345e5de634fd47973fb 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 8531eeaebbcb4d71e0b7f5158be50e593037bae1..fa075726a7a5dacdcb60d0dac595b517f757f2bd 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 03b938b8a28cef9e9136ce880497c26f414232ec..eb1c3f3b88d3253345307dc99cbde2a3007e9d52 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 61aa1f2bf51aad1e1f8cf6bb4a63b7ee5867e5e6..1900cf7b85345e29e2f6f110b8a64e181306e8f1 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 6d77a0c432920c6a8ddd78356f769b0ec0f5b147..a13fd9ac76753c769a1e1e7d7228f61383d2616a 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 286479b36f6c888fa805ba1572b6c693cb19ec81..b87940e3cafc7e94d3043c40b1cc98b85f3ca400 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 c72573ad33ab21926f8c8b54c51df647749e63c8..738b4388932f9724e7a078d3818af047ae80d59c 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 e26712318874931a93ffbbc4bd4cfe63866a8fcb..97f68d907b6df8f3e4f88325d648c767c2e48d67 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 5a094ec69106475d3b0ff305713baec6cb435e68..552763dd355b99cf0b54feab35342886c12b615f 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 be8cfa5c6bb24d42ee7155101e6722b327399a39..a5df02d7f21fced8f554faee1a1c4166843eb276 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 425616258e8491471d347eff2c1abe574c972fd6..6ff06d33f26a6b7b12ac7ec4aad0640acbbc268d 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 0bee2c7333c8aa9fc7b4acfb8a04b1cb781073f5..00a0b175771e02f0c782db44707b3cdfb51d06a5 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 4c98f34da83ee747e6dd65d539a5405a6fe945f6..16768992bbf18c8f4508316660746486c707eff0 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 a998d55c5e592644142e6a84465bc28022bf0a5c..6888a7730c9227eb231fae2ad8a2a83107b67e87 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 f335c015ac9d8d404cefcb697a0b1b2ad30d6d75..389ab5266c46ba3fa8339e0665376a08386cce47 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 dcea4d5b1c1be680767b25ff89d84f837040ffd4..780047f4eb9838af32e103c1cbcfb7dc32178562 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 96b1c9d830a2d9da278915142b74a76396e47096..af36a04486673b61e6a781a2b48510f44ba7384e 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 8bcc7eb0599c1a65f1ec4d57b2137be35263d1ac..e1d7381627b25834abc2b8bd64d2a0c44623fa3e 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 b78fec33c58e2f5cbaee814dbe0a340a27a882c0..e7a2ec755947ad6a69fcf35a5b36f1e81fb44989 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 81a4dabe59b642ba7de6c2e65027bbba8f91b62e..98b9eab8f8d3ef719dd1f05a2da5f6e0c9c1a52c 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 bdc8f1947d1f72eb71b8d374aed60e296ff76c3c..03c81b4c9d39768b696b72840b4cfca3ca28c533 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"