From c412181683c19efdda85c5e9759ada221e30a48c Mon Sep 17 00:00:00 2001
From: Timothy Flynn <trflynn89@pm.me>
Date: Tue, 1 Oct 2024 16:15:12 -0400
Subject: [PATCH] CI: Switch Linux runners to Ubuntu 24.04

---
 .github/actions/setup/action.yml            | 12 +++++-------
 .github/workflows/ci.yml                    |  6 +++---
 .github/workflows/ladybird-js-artifacts.yml | 10 ++++------
 .github/workflows/lint-commits.yml          |  2 +-
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index e4af149df20..f1a96c78170 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -20,12 +20,10 @@ runs:
         set -e
 
         wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-        sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-18 main'
+        sudo add-apt-repository 'deb http://apt.llvm.org/noble/ llvm-toolchain-noble-18 main'
 
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-
-        sudo apt-get update
-        sudo apt-get install autoconf autoconf-archive automake build-essential ccache clang-18 clang++-18 cmake curl fonts-liberation2 \
+        sudo apt-get update -y
+        sudo apt-get install -y autoconf autoconf-archive automake build-essential ccache clang-18 clang++-18 cmake curl fonts-liberation2 \
             gcc-13 g++-13 libavcodec-dev libavformat-dev libavutil-dev libegl1-mesa-dev libgl1-mesa-dev libpulse-dev libssl-dev \
             libstdc++-13-dev lld-18 nasm ninja-build qt6-base-dev qt6-tools-dev-tools tar unzip zip
 
@@ -43,8 +41,8 @@ runs:
       if: ${{ inputs.os == 'Linux' }}
       shell: bash
       run: |
-        python3 -m pip install --upgrade pip
-        pip3 install requests six
+        python3 -m pip install --break-system-packages --upgrade pip
+        pip3 install --break-system-packages requests six
 
     - name: 'Select latest Xcode'
       if: ${{ inputs.os == 'macOS' || inputs.os == 'Android' }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8508f1922ea..7a1b637870d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,14 +14,14 @@ jobs:
       fail-fast: false
       matrix:
         os_name: ['Linux']
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
         fuzzer: ['NO_FUZZ']
         toolchain: ['GNU']
         clang_plugins: [false]
 
         include:
           - os_name: 'Linux'
-            os: ubuntu-22.04
+            os: ubuntu-24.04
             fuzzer: 'NO_FUZZ'
             toolchain: 'Clang'
             clang_plugins: true
@@ -33,7 +33,7 @@ jobs:
             clang_plugins: false
 
           - os_name: 'Linux'
-            os: ubuntu-22.04
+            os: ubuntu-24.04
             fuzzer: 'FUZZ'
             toolchain: 'Clang'
             clang_plugins: false
diff --git a/.github/workflows/ladybird-js-artifacts.yml b/.github/workflows/ladybird-js-artifacts.yml
index 3cd4baa1ce8..44996e1c625 100644
--- a/.github/workflows/ladybird-js-artifacts.yml
+++ b/.github/workflows/ladybird-js-artifacts.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
         package_type: [Linux-x86_64]
         os_name: [Linux]
         include:
@@ -24,7 +24,7 @@ jobs:
             os_name: macOS
 
     concurrency:
-      group: ${{ github.workflow }}-${{ matrix.os }}
+      group: ${{ github.workflow }}-${{ matrix.os_name }}
       cancel-in-progress: true
 
     steps:
@@ -54,9 +54,7 @@ jobs:
             -DCMAKE_C_COMPILER=gcc-13 \
             -DCMAKE_CXX_COMPILER=g++-13 \
             -DENABLE_GUI_TARGETS=OFF
-        if: ${{ matrix.os == 'ubuntu-22.04' }}
-        env:
-          CCACHE_DIR: ${{ env.CCACHE_DIR }}
+        if: ${{ matrix.os_name == 'Linux' }}
 
       # FIXME: Add the following flag back when vcpkg supports Universal binaries:
       #        -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"
@@ -68,7 +66,7 @@ jobs:
             -DCMAKE_BUILD_TYPE=Release \
             -DCMAKE_OSX_DEPLOYMENT_TARGET="11.0" \
             -DENABLE_GUI_TARGETS=OFF
-        if: ${{ matrix.os == 'macos-14' }}
+        if: ${{ matrix.os_name == 'macOS' }}
 
       - name: Build and package js
         working-directory: Build
diff --git a/.github/workflows/lint-commits.yml b/.github/workflows/lint-commits.yml
index 966102e9dfe..b4d27a8e0c8 100644
--- a/.github/workflows/lint-commits.yml
+++ b/.github/workflows/lint-commits.yml
@@ -7,7 +7,7 @@ on: [pull_request_target]
 
 jobs:
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: always() && github.repository == 'LadybirdBrowser/ladybird'
 
     steps: