From 36ffd6b4ee12692b96c6b57cfae77bce68bc027e Mon Sep 17 00:00:00 2001
From: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
Date: Sat, 27 Dec 2025 22:51:26 +0100
Subject: [PATCH] chore: bump to ubuntu 24.04

no reason to keep using 22.04 with sharun

Signed-off-by: DioEgizio <83089242+DioEgizio@users.noreply.github.com>
---
 .../setup-dependencies/linux/action.yml       | 24 +------------------
 .github/workflows/build.yml                   |  6 +----
 2 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/.github/actions/setup-dependencies/linux/action.yml b/.github/actions/setup-dependencies/linux/action.yml
index fe75e23d0..73207ad9e 100644
--- a/.github/actions/setup-dependencies/linux/action.yml
+++ b/.github/actions/setup-dependencies/linux/action.yml
@@ -12,29 +12,7 @@ runs:
           dpkg-dev \
           ninja-build extra-cmake-modules pkg-config scdoc \
           cmark gamemode-dev libarchive-dev libcmark-dev libqrencode-dev zlib1g-dev \
-          libxcb-cursor-dev
-
-      # TODO(@getchoo): Install with the above when all targets use Ubuntu 24.04
-    - name: Install tomlplusplus
-      if: ${{ runner.arch == 'ARM64' }}
-      shell: bash
-      run: |
-        sudo apt-get -y install libtomlplusplus-dev
-
-      # FIXME(@getchoo): THIS IS HORRIBLE TO DO!
-      # Install tomlplusplus from Ubuntu 24.04, since it never got backported to 22.04
-      # I've done too much to continue keeping this as a submodule....
-    - name: Install tomlplusplus from 24.04
-      if: ${{ runner.arch != 'ARM64' }}
-      shell: bash
-      run: |
-        deb_arch="$(dpkg-architecture -q DEB_HOST_ARCH)"
-        curl -Lo libtomlplusplus-dev.deb http://mirrors.kernel.org/ubuntu/pool/universe/t/tomlplusplus/libtomlplusplus-dev_3.4.0+ds-0.2build1_"$deb_arch".deb
-        curl -Lo libtomlplusplus3t64.deb http://mirrors.kernel.org/ubuntu/pool/universe/t/tomlplusplus/libtomlplusplus3t64_3.4.0+ds-0.2build1_"$deb_arch".deb
-        sudo dpkg -i libtomlplusplus3t64.deb
-        sudo dpkg -i libtomlplusplus-dev.deb
-        rm *.deb
-        sudo apt-get install -f
+          libxcb-cursor-dev libtomlplusplus-dev
 
     - name: Setup AppImage tooling
       shell: bash
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cee54b4d2..62d4fa56a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -83,15 +83,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - os: ubuntu-22.04
+          - os: ubuntu-24.04
             artifact-name: Linux
             cmake-preset: linux
             qt-version: 6.10.1
 
-            # NOTE(@getchoo): Yes, we're intentionally using 24.04 here!!!
-            #
-            # It's not really documented anywhere AFAICT, but upstream Qt binaries
-            # *for the same version* are compiled against 24.04 on ARM, and *not* 22.04 like x64
           - os: ubuntu-24.04-arm
             artifact-name: Linux-aarch64
             cmake-preset: linux