Update to gcc 11.5 for el9

.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

README.md

@@ -8,7 +8,7 @@ All images include:
 - 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)   |
@@ -18,7 +18,7 @@ All images include:
 | 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      |
+| conan-el9-gcc115    | Rocky Linux 9  | x86_64  | gcc (GCC) 11.5.0 20240719 (Red Hat 11.5.0-5) |
 
 ## Build 
 

conan-el9-gcc114/.gitlab-ci.yml → 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"

conan-el9-gcc114/Dockerfile → conan-el9-gcc115/Dockerfile

-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"
 

conan-el9-gcc114/docker-compose.yml → conan-el9-gcc115/docker-compose.yml

 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