From da1b88496f9107433afea72fee4c2de9a349c6fe Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Sat, 6 Jul 2024 07:27:57 -0700
Subject: [PATCH] ci: Remove g++-9 configurations

---
 utils/tests/gitlab-ci-gcc.yml    | 59 +++-----------------------------
 utils/tests/gitlab-ci-ubuntu.yml | 10 +++---
 2 files changed, 9 insertions(+), 60 deletions(-)

diff --git a/utils/tests/gitlab-ci-gcc.yml b/utils/tests/gitlab-ci-gcc.yml
index e0d29a94c..f814b5876 100644
--- a/utils/tests/gitlab-ci-gcc.yml
+++ b/utils/tests/gitlab-ci-gcc.yml
@@ -4,7 +4,7 @@
 # "RELEASE", that has a value "weekly". Also, a variable "GCC" should be set
 # to True.
 
-# We support from 9 to the latest version. Check if everything builds fine
+# We support from 10 to the latest version. Check if everything builds fine
 # under debug, default, and optimized, on Linux.
 # The distro used is Ubuntu - the logic is:
 # - Test minimum and maximum GCC version
@@ -14,6 +14,8 @@
 # - jammy (22.04LTS) 11
 # - kinetic (22.10) 12
 # - lunar (23.04) 12
+# - lunar (23.10) 13
+# - noble (24.04LTS) 13
 
 .weekly-gcc-base:
   extends: .base-build
@@ -48,60 +50,7 @@ weekly-gcc:
   script:
     - echo "Starting GCC jobs"
 
-# GCC 9 (not tested as it's the default for Ubuntu 20.04)
-# weekly-build-gcc-9-debug:
-#   extends: .weekly-gcc-base
-#   needs: ["weekly-gcc"]
-#   image: ubuntu:20.04
-#   stage: build
-#   variables:
-#     MODE: debug
-#     COMPILER: g++-9
-#     LIBGSL: libgsl23
-
-# weekly-build-gcc-9-default:
-#   extends: .weekly-gcc-base
-#   needs: ["weekly-gcc"]
-#   image: ubuntu:20.04
-#   stage: build
-#   variables:
-#     MODE: default
-#     COMPILER: g++-9
-#     LIBGSL: libgsl23
-
-# weekly-build-gcc-9-optimized:
-#   extends: .weekly-gcc-base
-#   needs: ["weekly-gcc"]
-#   image: ubuntu:20.04
-#   stage: build
-#   variables:
-#     MODE: optimized
-#     COMPILER: g++-9
-#     LIBGSL: libgsl23
-
-# weekly-test-gcc-9-default:
-#   extends: .weekly-gcc-base
-#   image: ubuntu:20.04
-#   stage: test
-#   needs: ["weekly-build-gcc-9-default"]
-#   dependencies:
-#     - weekly-build-gcc-9-default
-#   variables:
-#     MODE: default
-#     COMPILER: g++-9
-#     LIBGSL: libgsl23
-
-# weekly-test-gcc-9-optimized:
-#   extends: .weekly-gcc-base
-#   image: ubuntu:20.04
-#   stage: test
-#   needs: ["weekly-build-gcc-9-optimized"]
-#   dependencies:
-#     - weekly-build-gcc-9-optimized
-#   variables:
-#     MODE: optimized
-#     COMPILER: g++-9
-#     LIBGSL: libgsl23
+# GCC 10 (not tested here since it is configured for Ubuntu 20.04)
 
 # GCC 13
 weekly-build-gcc-13-debug:
diff --git a/utils/tests/gitlab-ci-ubuntu.yml b/utils/tests/gitlab-ci-ubuntu.yml
index ff8825f70..83c1f7fef 100644
--- a/utils/tests/gitlab-ci-ubuntu.yml
+++ b/utils/tests/gitlab-ci-ubuntu.yml
@@ -49,7 +49,7 @@ weekly-build-ubuntu-20.04-debug:
   variables:
     MODE: debug
     LIBGSL: libgsl23
-    COMPILER: g++
+    COMPILER: g++-10
 
 weekly-build-ubuntu-20.04-default:
   extends: .weekly-base-ubuntu
@@ -59,7 +59,7 @@ weekly-build-ubuntu-20.04-default:
   variables:
     MODE: default
     LIBGSL: libgsl23
-    COMPILER: g++
+    COMPILER: g++-10
 
 weekly-build-ubuntu-20.04-optimized:
   extends: .weekly-base-ubuntu
@@ -69,7 +69,7 @@ weekly-build-ubuntu-20.04-optimized:
   variables:
     MODE: optimized
     LIBGSL: libgsl23
-    COMPILER: g++
+    COMPILER: g++-10
 
 weekly-test-ubuntu-20.04-default:
   extends: .weekly-base-ubuntu
@@ -81,7 +81,7 @@ weekly-test-ubuntu-20.04-default:
   variables:
     MODE: default
     LIBGSL: libgsl23
-    COMPILER: g++
+    COMPILER: g++-10
 
 weekly-test-ubuntu-20.04-optimized:
   extends: .weekly-base-ubuntu
@@ -93,7 +93,7 @@ weekly-test-ubuntu-20.04-optimized:
   variables:
     MODE: optimized
     LIBGSL: libgsl23
-    COMPILER: g++
+    COMPILER: g++-10
 
 # Ubuntu 22.04 (Until January 2032)
 weekly-build-ubuntu-22.04-debug: