From df79b77002f68defac783be9d3abeb507fcc28b6 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Fri, 22 Nov 2024 21:21:06 +0000
Subject: [PATCH] CI: upgrade GCC baseline from 4.8 -> 5.4 (5.5)

GCC's baseline was changed from C++11 -> C++14 and GCC 4.8 -> GCC 5.4
in r15-4719-ga9ec1bc06bd3cc, so adjust the baseline CI job accordingly.

One quirk here is that the Ubuntu image we're using in CI has 5.5.0
rather than 5.4.0. But I think we can eat that difference.

ChangeLog:
	* .github/workflows/ccpp.yml: Use GCC 5.5 instead of GCC 4.8.
	* .github/bors.toml: Update CI job name.
---
 .github/bors.toml          |  2 +-
 .github/workflows/ccpp.yml | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/bors.toml b/.github/bors.toml
index 732ef5c8dcc2..6fb2d82fe50b 100644
--- a/.github/bors.toml
+++ b/.github/bors.toml
@@ -1,7 +1,7 @@
 status = [
   "build-and-check-ubuntu-64bit",
   "build-and-check-ubuntu-32bit",
-  "build-and-check-gcc-48",
+  "build-and-check-gcc-5",
 ]
 # Uncomment this to use a two hour timeout.
 # The default is one hour.
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 5485763c0560..d74588a24071 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -266,7 +266,7 @@ jobs:
               exit 0; \
             fi
 
-  build-and-check-gcc-48:
+  build-and-check-gcc-5:
 
     runs-on: ubuntu-22.04
     container: ubuntu:18.04
@@ -291,10 +291,10 @@ jobs:
                   libmpfr-dev \
                   libmpc-dev \
                   build-essential \
-                  gcc-4.8 \
-                  g++-4.8 \
-                  gcc-4.8-multilib \
-                  g++-4.8-multilib \
+                  gcc-5 \
+                  g++-5 \
+                  gcc-5-multilib \
+                  g++-5-multilib \
                   dejagnu;
           # install Rust directly using rustup
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain=1.72.0;
@@ -307,8 +307,8 @@ jobs:
            mkdir -p gccrs-build;
            cd gccrs-build;
            ../configure \
-               CC='gcc-4.8' \
-               CXX='g++-4.8' \
+               CC='gcc-5' \
+               CXX='g++-5' \
                --enable-languages=rust \
                --disable-bootstrap \
                --enable-multilib
@@ -328,7 +328,7 @@ jobs:
     - name: Archive check-rust results
       uses: actions/upload-artifact@v3
       with:
-        name: check-rust-logs-4.8
+        name: check-rust-logs-5
         path: |
           gccrs-build/gcc/testsuite/rust/