From 6d5615eb54ca6b6eb6f99b29bd7ef4b02098c58c Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Sun, 3 May 2026 12:23:38 +0900
Subject: [PATCH] CI to use 24.04 without no pipewire ppa

---
 .github/workflows/build-all-features.yml          | 2 +-
 .github/workflows/build-appimage.yml              | 2 +-
 .github/workflows/build-default.yml               | 2 +-
 .github/workflows/build-wayland-openvr.yml        | 2 +-
 .github/workflows/build-wayland-openxr.yml        | 2 +-
 .github/workflows/build-x11-openvr.yml            | 2 +-
 .github/workflows/build-x11-openxr.yml            | 2 +-
 .github/workflows/make-release.yml                | 2 +-
 .github/workflows/scripts/appimage_prepare_env.sh | 2 --
 9 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-all-features.yml b/.github/workflows/build-all-features.yml
index ea748df3..81267f63 100644
--- a/.github/workflows/build-all-features.yml
+++ b/.github/workflows/build-all-features.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-appimage.yml b/.github/workflows/build-appimage.yml
index 9eb37b2c..4776d417 100644
--- a/.github/workflows/build-appimage.yml
+++ b/.github/workflows/build-appimage.yml
@@ -15,7 +15,7 @@ env:
   
 jobs:
   build_appimage:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-default.yml b/.github/workflows/build-default.yml
index a20e5dfa..3ad4d140 100644
--- a/.github/workflows/build-default.yml
+++ b/.github/workflows/build-default.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-wayland-openvr.yml b/.github/workflows/build-wayland-openvr.yml
index 9b540dc5..dd3beb57 100644
--- a/.github/workflows/build-wayland-openvr.yml
+++ b/.github/workflows/build-wayland-openvr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-wayland-openxr.yml b/.github/workflows/build-wayland-openxr.yml
index 42a5c33c..9ff5c9d4 100644
--- a/.github/workflows/build-wayland-openxr.yml
+++ b/.github/workflows/build-wayland-openxr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-x11-openvr.yml b/.github/workflows/build-x11-openvr.yml
index cacd5e5c..2d54b81f 100644
--- a/.github/workflows/build-x11-openvr.yml
+++ b/.github/workflows/build-x11-openvr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/build-x11-openxr.yml b/.github/workflows/build-x11-openxr.yml
index 7e045dee..697f0806 100644
--- a/.github/workflows/build-x11-openxr.yml
+++ b/.github/workflows/build-x11-openxr.yml
@@ -11,7 +11,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index 3225e372..01286bc0 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -13,7 +13,7 @@ env:
   
 jobs:
   make_release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./wayvr
diff --git a/.github/workflows/scripts/appimage_prepare_env.sh b/.github/workflows/scripts/appimage_prepare_env.sh
index 7b7f14f3..857d81c7 100755
--- a/.github/workflows/scripts/appimage_prepare_env.sh
+++ b/.github/workflows/scripts/appimage_prepare_env.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-sudo add-apt-repository -syn universe
-sudo add-apt-repository -syn ppa:pipewire-debian/pipewire-upstream || sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 25088A0359807596
 sudo apt-get update
 sudo apt-get install -y fuse cmake pkg-config fontconfig libasound2-dev libxkbcommon-dev libxkbcommon-x11-0 libxkbcommon-x11-dev libopenxr-dev libfontconfig-dev libdbus-1-dev libpipewire-0.3-0 libpipewire-0.3-dev libspa-0.2-dev libx11-6 libxext6 libxrandr2 libx11-dev libxext-dev libxrandr-dev libopenvr-dev libopenvr-api1 libwayland-dev libegl-dev libxcb-glx0 libxcb-glx0-dev
 rustup update