diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f872d493a090191d5e57a823252ec92415208969..e32c27deb610cb5903168463df8e5a8f40db21e4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -61,8 +61,8 @@ conan-el7-gcc114: include: conan-el7-gcc114/.gitlab-ci.yml strategy: depend -conan-el9-gcc114: +conan-el9-gcc115: stage: triggers trigger: - include: conan-el9-gcc114/.gitlab-ci.yml + include: conan-el9-gcc115/.gitlab-ci.yml strategy: depend \ No newline at end of file diff --git a/README.md b/README.md index 503abd087fb28dc5484ae78fb7e9205473e09f2a..afd6a1008b9afc0d67d235cdcb9894af1c34b60b 100644 --- a/README.md +++ b/README.md @@ -7,18 +7,18 @@ All images include: - Cmake 3.31.5 - Git 2.39.2 -| Image | OS | Arch | GCC | -| ------------------- | -------------- | ------- | --------------------------------------------| -| conan-el6-gcc44 | CentOS 6 | x86_64 | gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23) | -| conan-el6-gcc44-x86 | CentOS 6 | i686 | gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23) | -| conan-el6-gcc91 | CentOS 6 | x86_64 | gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2) | -| conan-el6-gcc91-x86 | CentOS 6 | i686 | gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2) | -| conan-el7-gcc48 | CentOS 7 | x86_64 | gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-44) | -| conan-el7-gcc48-x86 | CentOS 7 | i686 | gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-44) | -| conan-el7-gcc93 | CentOS 7 | x86_64 | gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2) | -| conan-el7-gcc93-x86 | CentOS 7 | i686 | gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2) | -| conan-el7-gcc114 | CentOS 7 | x86_64 | gcc (conda-forge gcc 11.4.0-13) 11.4.0 | -| conan-el9-gcc114 | Rocky Linux 9 | x86_64 | gcc (conda-forge gcc 11.4.0-13) 11.4.0 | +| Image | OS | Arch | GCC | +| ------------------- | -------------- | ------- | ---------------------------------------------| +| conan-el6-gcc44 | CentOS 6 | x86_64 | gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23) | +| conan-el6-gcc44-x86 | CentOS 6 | i686 | gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-23) | +| conan-el6-gcc91 | CentOS 6 | x86_64 | gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2) | +| conan-el6-gcc91-x86 | CentOS 6 | i686 | gcc (GCC) 9.1.1 20190605 (Red Hat 9.1.1-2) | +| conan-el7-gcc48 | CentOS 7 | x86_64 | gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-44) | +| conan-el7-gcc48-x86 | CentOS 7 | i686 | gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-44) | +| conan-el7-gcc93 | CentOS 7 | x86_64 | gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2) | +| conan-el7-gcc93-x86 | CentOS 7 | i686 | gcc (GCC) 9.3.1 20200408 (Red Hat 9.3.1-2) | +| conan-el7-gcc114 | CentOS 7 | x86_64 | gcc (conda-forge gcc 11.4.0-13) 11.4.0 | +| conan-el9-gcc115 | Rocky Linux 9 | x86_64 | gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5) | ## Build diff --git a/conan-el9-gcc114/.gitlab-ci.yml b/conan-el9-gcc115/.gitlab-ci.yml similarity index 96% rename from conan-el9-gcc114/.gitlab-ci.yml rename to conan-el9-gcc115/.gitlab-ci.yml index 263d48aa1ff602e63694ad9baee66c797c66d384..6c9b57e6e163cce1bba4774cc4a94c76db440b19 100644 --- a/conan-el9-gcc114/.gitlab-ci.yml +++ b/conan-el9-gcc115/.gitlab-ci.yml @@ -3,7 +3,7 @@ services: - docker:dind variables: - NAME: conan-el9-gcc114 + NAME: conan-el9-gcc115 CONTAINER_TEST_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:$CI_COMMIT_REF_SLUG CONTAINER_RELEASE_IMAGE: ${CI_REGISTRY_IMAGE}/${NAME}:latest @@ -26,7 +26,7 @@ test: script: - docker run --rm ${CONTAINER_TEST_IMAGE} cat /etc/rocky-release | grep "Rocky Linux release 9" - docker run --rm ${CONTAINER_TEST_IMAGE} uname -m | grep "x86_64" - - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.4" + - docker run --rm ${CONTAINER_TEST_IMAGE} gcc --version | grep "gcc (GCC) 11\.5" - docker run --rm ${CONTAINER_TEST_IMAGE} cmake --version | grep "3.31.5" - docker run --rm ${CONTAINER_TEST_IMAGE} git --version | grep "2.39.2" - docker run --rm ${CONTAINER_TEST_IMAGE} python --version | grep "3.6.13" diff --git a/conan-el9-gcc114/Dockerfile b/conan-el9-gcc115/Dockerfile similarity index 98% rename from conan-el9-gcc114/Dockerfile rename to conan-el9-gcc115/Dockerfile index edc3196fcb308882cb93e207671252e788a9a952..05f005f8d90dff9874d40aa15f968bba7061adb1 100644 --- a/conan-el9-gcc114/Dockerfile +++ b/conan-el9-gcc115/Dockerfile @@ -1,4 +1,4 @@ -FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el9-gcc114 +FROM gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/dev-docker-tools/dev-el9-gcc115 LABEL maintainer="Patrick Madela <patrick.madela@synchrotron-soleil.fr" diff --git a/conan-el9-gcc114/docker-compose.yml b/conan-el9-gcc115/docker-compose.yml similarity index 65% rename from conan-el9-gcc114/docker-compose.yml rename to conan-el9-gcc115/docker-compose.yml index 5a0d63bc8019ae801f2b596be3e201fe591b2699..5c32751f25da41542b08911bc318bfbbbf325fcd 100644 --- a/conan-el9-gcc114/docker-compose.yml +++ b/conan-el9-gcc115/docker-compose.yml @@ -1,16 +1,16 @@ version: "3.8" services: - conan-el9-gcc114: + conan-el9-gcc115: build: context: .. - dockerfile: conan-el9-gcc114/Dockerfile + dockerfile: conan-el9-gcc115/Dockerfile args: - http_proxy - https_proxy - no_proxy - image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el9-gcc114" - container_name: conan-el9-gcc114 + image: "gitlab-registry.synchrotron-soleil.fr/software-control-system/containers/conan-docker-tools/conan-el9-gcc115" + container_name: conan-el9-gcc115 tty: true environment: - http_proxy