From 76c7425a118adf5478ee5342b60695b843d74f9f Mon Sep 17 00:00:00 2001
From: arch1t3cht <arch1t3cht@gmail.com>
Date: Tue, 21 Jan 2025 23:58:17 +0100
Subject: [PATCH] ci: Switch back to ubuntu-latest

ubuntu-latest should be on Ubuntu 24.04 everywhere now, so the separate
lanes are no longer needed.
---
 .github/workflows/ci.yml | 33 +++++++--------------------------
 1 file changed, 7 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6ddecef6c9..7cee7a3fc6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -40,26 +40,14 @@ jobs:
           #  msvc: false
           #}
           - {
-            name: Ubuntu 22 Debug,
-            os: ubuntu-22.04,
+            name: Ubuntu Debug,
+            os: ubuntu-latest,
             buildtype: debugoptimized,
             args: -Db_pch=false
           }
           - {
-            name: Ubuntu 22 Release,
-            os: ubuntu-22.04,
-            buildtype: release,
-            args: -Db_pch=false
-          }
-          - {
-            name: Ubuntu 24 Debug,
-            os: ubuntu-24.04,
-            buildtype: debugoptimized,
-            args: -Db_pch=false
-          }
-          - {
-            name: Ubuntu 24 Release,
-            os: ubuntu-24.04,
+            name: Ubuntu Release,
+            os: ubuntu-latest,
             buildtype: release,
             args: -Db_pch=false
           }
@@ -131,14 +119,7 @@ jobs:
         if: startsWith(matrix.config.os, 'ubuntu-')
         run: |
           sudo apt-get update
-          sudo apt-get install ninja-build build-essential libx11-dev libfreetype6-dev pkg-config libfontconfig1-dev libass-dev libasound2-dev libffms2-dev intltool libboost-all-dev libhunspell-dev libcurl4-openssl-dev libuchardet-dev libgtest-dev libgmock-dev ${{ matrix.config.os == 'ubuntu-22.04' && 'libwxgtk3.0-gtk3-dev' || 'libwxgtk3.2-dev' }}
-
-      - name: Set compiler (Linux)
-        if: matrix.config.os == 'ubuntu-22.04'
-        run: |
-          # We need to use Clang on Ubuntu 22 to avoid a bug with GCC 11
-          echo "CC=clang" >> $GITHUB_ENV
-          echo "CXX=clang++" >> $GITHUB_ENV
+          sudo apt-get install ninja-build build-essential libx11-dev libfreetype6-dev pkg-config libfontconfig1-dev libass-dev libasound2-dev libffms2-dev intltool libboost-all-dev libhunspell-dev libcurl4-openssl-dev libuchardet-dev libgtest-dev libgmock-dev libwxgtk3.2-dev
 
       - name: Configure
         run: meson setup build ${{ matrix.config.args }} -Dbuildtype=${{ matrix.config.buildtype }} ${{ github.ref_type == 'tag' && '-Dofficial_release=true' || '' }}
@@ -193,7 +174,7 @@ jobs:
 
       # Tarball
       - name: Generate tarball
-        if: matrix.config.os == 'ubuntu-24.04' && matrix.config.buildtype == 'release'
+        if: matrix.config.os == 'ubuntu-latest' && matrix.config.buildtype == 'release'
         run: |
           set -e
 
@@ -207,7 +188,7 @@ jobs:
 
       - name: Upload artifacts - tarball
         uses: actions/upload-artifact@v4
-        if: matrix.config.os == 'ubuntu-24.04' && matrix.config.buildtype == 'release'
+        if: matrix.config.os == 'ubuntu-latest' && matrix.config.buildtype == 'release'
         with:
           name: Source Tarball
           path: build/meson-dist/*.tar.xz