From 0292217bd20828a83d18467c9adf263cfd33abc4 Mon Sep 17 00:00:00 2001
From: Mrlinkwii <Mrlinkwii@users.noreply.github.com>
Date: Wed, 1 Jan 2025 19:58:10 +0000
Subject: [PATCH] CI: update to 24.04 LTS & Clang 18

---
 .github/workflows/cron_update_base_translation.yml   |  2 +-
 .github/workflows/linux_build_flatpak.yml            |  2 +-
 .github/workflows/linux_build_qt.yml                 | 12 ++++++------
 .../workflows/scripts/linux/pcsx2-qt.metainfo.xml.in |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/cron_update_base_translation.yml b/.github/workflows/cron_update_base_translation.yml
index 0baeb23377..7ad7e12919 100644
--- a/.github/workflows/cron_update_base_translation.yml
+++ b/.github/workflows/cron_update_base_translation.yml
@@ -9,7 +9,7 @@ jobs:
   update:
     if: github.repository == 'PCSX2/pcsx2'
     name: "Update Base Translation"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/linux_build_flatpak.yml b/.github/workflows/linux_build_flatpak.yml
index bf02d89c88..e0b34ef12a 100644
--- a/.github/workflows/linux_build_flatpak.yml
+++ b/.github/workflows/linux_build_flatpak.yml
@@ -12,7 +12,7 @@ on:
       os:
         required: false
         type: string
-        default: ubuntu-22.04
+        default: ubuntu-24.04
       platform:
         required: false
         type: string
diff --git a/.github/workflows/linux_build_qt.yml b/.github/workflows/linux_build_qt.yml
index 38e3984b90..2df640760a 100644
--- a/.github/workflows/linux_build_qt.yml
+++ b/.github/workflows/linux_build_qt.yml
@@ -12,7 +12,7 @@ on:
       os:
         required: false
         type: string
-        default: ubuntu-22.04
+        default: ubuntu-24.04
       platform:
         required: false
         type: string
@@ -101,16 +101,16 @@ jobs:
       - name: Install Packages
         run: |
           tools/retry.sh wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
-          sudo tools/retry.sh apt-add-repository -n 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main'
+          sudo tools/retry.sh apt-add-repository -n 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main'
           sudo tools/retry.sh apt-get update
           sudo tools/retry.sh apt-get -y install \
-            build-essential ccache clang-17 cmake curl extra-cmake-modules git libasound2-dev libaio-dev libavcodec-dev libavformat-dev libavutil-dev \
+            build-essential ccache clang-18 cmake curl extra-cmake-modules git libasound2-dev libaio-dev libavcodec-dev libavformat-dev libavutil-dev \
             libcurl4-openssl-dev libdbus-1-dev libdecor-0-dev libegl-dev libevdev-dev libfontconfig-dev libfreetype-dev libfuse2 libgtk-3-dev libgudev-1.0-dev \
             libharfbuzz-dev libinput-dev libopengl-dev libpcap-dev libpipewire-0.3-dev libpulse-dev libssl-dev libswresample-dev libswscale-dev libudev-dev \
             libwayland-dev libx11-dev libx11-xcb-dev libxcb1-dev libxcb-composite0-dev libxcb-cursor-dev libxcb-damage0-dev libxcb-glx0-dev libxcb-icccm4-dev \
             libxcb-image0-dev libxcb-keysyms1-dev libxcb-present-dev libxcb-randr0-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-shape0-dev \
             libxcb-shm0-dev libxcb-sync-dev libxcb-util-dev libxcb-xfixes0-dev libxcb-xinput-dev libxcb-xkb-dev libxext-dev libxkbcommon-x11-dev libxrandr-dev \
-            lld-17 llvm-17 ninja-build patchelf pkg-config zlib1g-dev
+            lld-18 llvm-18 ninja-build patchelf pkg-config zlib1g-dev
 
       - name: Cache Dependencies
         id: cache-deps
@@ -136,8 +136,8 @@ jobs:
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \
             -DCMAKE_PREFIX_PATH="$HOME/deps" \
-            -DCMAKE_C_COMPILER=clang-17 \
-            -DCMAKE_CXX_COMPILER=clang++-17 \
+            -DCMAKE_C_COMPILER=clang-18 \
+            -DCMAKE_CXX_COMPILER=clang++-18 \
             -DCMAKE_EXE_LINKER_FLAGS_INIT="-fuse-ld=lld" \
             -DCMAKE_MODULE_LINKER_FLAGS_INIT="-fuse-ld=lld" \
             -DCMAKE_C_COMPILER_LAUNCHER=ccache \
diff --git a/.github/workflows/scripts/linux/pcsx2-qt.metainfo.xml.in b/.github/workflows/scripts/linux/pcsx2-qt.metainfo.xml.in
index 158c6cf071..be59116218 100644
--- a/.github/workflows/scripts/linux/pcsx2-qt.metainfo.xml.in
+++ b/.github/workflows/scripts/linux/pcsx2-qt.metainfo.xml.in
@@ -20,7 +20,7 @@
   <url type="donation">https://github.com/sponsors/PCSX2</url>
   <url type="faq">https://pcsx2.net/docs/</url>
   <url type="help">https://pcsx2.net/discord</url>
-  <url type="contribute">https://github.com/PCSX2/pcsx2/blob/master/.github/CONTRIBUTING.md</url>
+  <url type="contribute">https://pcsx2.net/docs/contributing/</url>
   <url type="translate">https://crowdin.com/project/pcsx2-emulator</url>
   <url type="contact">https://mastodon.social/@PCSX2</url>
   <screenshots>