From 0fe85c4cfb9f65c1a23cf41ef522589f7d2b030e Mon Sep 17 00:00:00 2001
From: Sean Vig <sean.v.775@gmail.com>
Date: Thu, 11 Jul 2024 22:36:29 -0400
Subject: [PATCH] Update CI to run on latest ubuntu version

---
 .github/workflows/ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8d34c3de..799c84a4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build-wayland:
     name: Build Wayland libraries
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       libdrm-version: "2.4.114"
       seatd-version: "0.6.4"
@@ -47,10 +47,10 @@ jobs:
             libxfont-dev \
             libxkbcommon-dev \
             libxshmfence-dev \
+            meson \
             xfonts-utils \
             xserver-xorg-dev \
             ninja-build
-          sudo pip install meson
       - name: Set environment variables
         run: |
           echo "CPATH=${HOME}/wayland/usr/include" >> $GITHUB_ENV
@@ -149,7 +149,7 @@ jobs:
           if-no-files-found: error
   unit-test:
     name: Python ${{ matrix.python-version}} unit tests (${{ matrix.wlroots-version }})
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build-wayland
     strategy:
       fail-fast: false
@@ -217,7 +217,7 @@ jobs:
           WLR_RENDERER_ALLOW_SOFTWARE: '1'
   ruff-test:
     name: Ruff tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       python-version: "3.10"
     steps:
@@ -231,7 +231,7 @@ jobs:
         uses: chartboost/ruff-action@v1
   mypy-test:
     name: mypy tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       python-version: "3.12"
     steps:
@@ -258,7 +258,7 @@ jobs:
           mypy check_headers.py
   black-test:
     name: black tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     env:
       python-version: "3.12"
     steps:
@@ -275,7 +275,7 @@ jobs:
         run: black --check wlroots tiny check_headers.py
   packaging-test:
     name: packaging tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build-wayland
     env:
       python-version: "3.12"
@@ -311,7 +311,7 @@ jobs:
           twine check dist/*
   protocol-headers-test:
     name: protocol headers test
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: build-wayland
     env:
       python-version: "3.12"