From 31db1675a4d2d6d6c18691b612abece95ffac1d9 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Tue, 14 May 2024 09:22:46 -0700
Subject: [PATCH] Upgrade to Ubuntu 24.04 CI runner

---
 .github/workflows/choreo.yml      | 7 +++----
 .github/workflows/choreolib.yml   | 4 ++--
 .github/workflows/docs.yml        | 2 +-
 .github/workflows/lint-format.yml | 7 +++----
 4 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/choreo.yml b/.github/workflows/choreo.yml
index 6ef00694f..7b83a79d5 100644
--- a/.github/workflows/choreo.yml
+++ b/.github/workflows/choreo.yml
@@ -31,7 +31,7 @@ jobs:
             tauri-build-flags: -- --target aarch64-apple-darwin
 
           - artifact-name: Linux-x86_64
-            os: ubuntu-22.04
+            os: ubuntu-24.04
             tauri-build-flags:
 
     name: "${{ matrix.artifact-name }}"
@@ -52,8 +52,7 @@ jobs:
             libgtk-3-dev \
             librsvg2-dev \
             libssl-dev \
-            libwebkit2gtk-4.0-dev \
-            wget
+            libwebkit2gtk-4.1-dev
 
       - name: Install Node.js dependencies
         run: npm install
@@ -99,7 +98,7 @@ jobs:
   release:
     name: Create draft release
     needs: [build]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     if: |
       github.repository_owner == 'SleipnirGroup' &&
       startsWith(github.ref, 'refs/tags/v')
diff --git a/.github/workflows/choreolib.yml b/.github/workflows/choreolib.yml
index ea3acdf06..8cd2b7ae1 100644
--- a/.github/workflows/choreolib.yml
+++ b/.github/workflows/choreolib.yml
@@ -27,7 +27,7 @@ jobs:
             build-options:
 
     name: "${{ matrix.artifact-name }}"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     container: ${{ matrix.container }}
     steps:
       - uses: actions/checkout@v4
@@ -128,7 +128,7 @@ jobs:
   combine:
     name: Combine
     needs: [build-docker, build-host]
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 437b405c2..4ceb2c9c0 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -7,7 +7,7 @@ permissions:
 
 jobs:
   deploy:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
 
diff --git a/.github/workflows/lint-format.yml b/.github/workflows/lint-format.yml
index fc4cd4cdd..890abb72d 100644
--- a/.github/workflows/lint-format.yml
+++ b/.github/workflows/lint-format.yml
@@ -9,7 +9,7 @@ concurrency:
 jobs:
   format:
     name: "Format"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -31,8 +31,7 @@ jobs:
             libgtk-3-dev \
             librsvg2-dev \
             libssl-dev \
-            libwebkit2gtk-4.0-dev \
-            wget
+            libwebkit2gtk-4.1-dev
 
       - uses: actions/setup-node@v3
         with:
@@ -75,7 +74,7 @@ jobs:
 
   choreolib-tidy:
     name: "ChoreoLib clang-tidy"
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with: