From 0871365c28d71baf31f57bda56676494d13d324f Mon Sep 17 00:00:00 2001
From: Dan Fandrich <dan@coneharvesters.com>
Date: Tue, 11 Jun 2024 11:47:36 -0700
Subject: [PATCH] Bump Ubuntu CI to 24.04

This brings in newer versions of compilers.
---
 .github/workflows/ci.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1cc2499..70cd186 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,9 +18,9 @@ env:
   MAKEFLAGS: -j 2
 
 jobs:
-  build-22_04:
-    name: 'Ubuntu 22.04 native and cross-compiled builds'
-    runs-on: ubuntu-22.04
+  build-24_04:
+    name: 'Ubuntu 24.04 native and cross-compiled builds'
+    runs-on: ubuntu-24.04
     steps:
     - uses: actions/checkout@v4
     - name: 'Install deps'
@@ -29,19 +29,19 @@ jobs:
         sudo env DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-suggests --no-install-recommends
         make
         clang
-        gcc-10-i686-linux-gnu
+        gcc-14-i686-linux-gnu
         libc6-dev-i386-cross
         gcc-mingw-w64
         wine
         dos2unix
         qemu-user
-        gcc-10-aarch64-linux-gnu
+        gcc-14-aarch64-linux-gnu
         libc6-dev-arm64-cross
-        gcc-10-arm-linux-gnueabi
+        gcc-14-arm-linux-gnueabi
         libc6-dev-armel-cross
-        gcc-10-powerpc-linux-gnu
+        gcc-14-powerpc-linux-gnu
         libc6-dev-powerpc-cross
-        gcc-10-powerpc64-linux-gnu
+        gcc-14-powerpc64-linux-gnu
         libc6-dev-ppc64-cross
     - name: 'Compile with gcc'
       run: make linux
@@ -52,23 +52,23 @@ jobs:
     - name: 'Run tests with clang'
       run: make test
     - name: 'Compile with gcc 32-bit'
-      run: make clean && make linux LINUX_CC=i686-linux-gnu-gcc-10 LINUX_CFLAGS='-m32 -O2 -DUNIX -Wall -Wshadow -Wpedantic -Wcast-qual -Wcast-align -Wwrite-strings -Wno-attributes' LDFLAGS=-static
+      run: make clean && make linux LINUX_CC=i686-linux-gnu-gcc-14 LINUX_CFLAGS='-m32 -O2 -DUNIX -Wall -Wshadow -Wpedantic -Wcast-qual -Wcast-align -Wwrite-strings -Wno-attributes' LDFLAGS=-static
     - name: 'Run tests with gcc 32-bit'
       run: make test
     - name: 'Compile with gcc-aarch64'
-      run: make clean && make linux LINUX_CC=aarch64-linux-gnu-gcc-10 LDFLAGS=-static
+      run: make clean && make linux LINUX_CC=aarch64-linux-gnu-gcc-14 LDFLAGS=-static
     - name: 'Run tests with gcc-aarch64'
       run: make test TESTWRAPPER=qemu-aarch64
     - name: 'Compile with gcc-arm'
-      run: make clean && make linux LINUX_CC=arm-linux-gnueabi-gcc-10 LDFLAGS=-static
+      run: make clean && make linux LINUX_CC=arm-linux-gnueabi-gcc-14 LDFLAGS=-static
     - name: 'Run tests with gcc-arm'
       run: make test TESTWRAPPER=qemu-arm
     - name: 'Compile with gcc-powerpc'
-      run: make clean && make linux LINUX_CC=powerpc-linux-gnu-gcc-10 LDFLAGS=-static
+      run: make clean && make linux LINUX_CC=powerpc-linux-gnu-gcc-14 LDFLAGS=-static
     - name: 'Run tests with gcc-powerpc'
       run: make test TESTWRAPPER=qemu-ppc
     - name: 'Compile with gcc-powerpc64'
-      run: make clean && make linux LINUX_CC=powerpc64-linux-gnu-gcc-10 LDFLAGS=-static
+      run: make clean && make linux LINUX_CC=powerpc64-linux-gnu-gcc-14 LDFLAGS=-static
     - name: 'Run tests with gcc-powerpc64'
       run: make test TESTWRAPPER=qemu-ppc64
     - name: 'Set up wine'
@@ -83,7 +83,7 @@ jobs:
         # Run wine once to set it up, which displays some logs that would mess up tests
         WINEDEBUG=-all wine cmd /c exit
     - name: 'Compile with mingw32-posix'
-      run: make clean && make linux LINUX_CC=x86_64-w64-mingw32-gcc-10-posix
+      run: make clean && make linux LINUX_CC=x86_64-w64-mingw32-gcc-13-posix
     - name: 'Run tests with mingw32-posix+wine'
       run: make test TESTWRAPPER=./wine-wrapper
     - name: 'Compile with mingw32'