From f85e6088ce73f1d8be8c8236baa86296aa563d81 Mon Sep 17 00:00:00 2001
From: galister <22305755+galister@users.noreply.github.com>
Date: Wed, 14 May 2025 17:50:12 +0900
Subject: [PATCH] use prepare env script for all actions

---
 .github/workflows/build-all-features.yml            |  5 +----
 .github/workflows/build-default.yml                 |  5 +----
 .github/workflows/build-wayland-openvr.yml          |  5 +----
 .../workflows/build-wayland-openxr-openvr-wayvr.yml |  5 +----
 .github/workflows/build-wayland-openxr.yml          |  5 +----
 .github/workflows/build-x11-openvr.yml              |  5 +----
 .github/workflows/build-x11-openxr.yml              |  5 +----
 .github/workflows/make-release.yml                  | 13 +------------
 .github/workflows/scripts/appimage_prepare_env.sh   | 10 ++++++----
 9 files changed, 14 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/build-all-features.yml b/.github/workflows/build-all-features.yml
index d75eb72..dc367a5 100644
--- a/.github/workflows/build-all-features.yml
+++ b/.github/workflows/build-all-features.yml
@@ -18,10 +18,7 @@ jobs:
       uses: mozilla-actions/sccache-action@v0.0.9
     - name: Prepare Environment
       run: |
-        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 -y
-        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
+        .github/workflows/scripts/appimage_prepare_env.sh
     - name: Build
       run: cargo build --verbose --all-features
     - name: Run tests
diff --git a/.github/workflows/build-default.yml b/.github/workflows/build-default.yml
index 285094d..614b066 100644
--- a/.github/workflows/build-default.yml
+++ b/.github/workflows/build-default.yml
@@ -18,10 +18,7 @@ jobs:
       uses: mozilla-actions/sccache-action@v0.0.9
     - name: Prepare Environment
       run: |
-        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 -y
-        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
+        .github/workflows/scripts/appimage_prepare_env.sh
     - name: Run cargo fmt
       run: cargo fmt --check
     - name: Build
diff --git a/.github/workflows/build-wayland-openvr.yml b/.github/workflows/build-wayland-openvr.yml
index b731009..dce2e71 100644
--- a/.github/workflows/build-wayland-openvr.yml
+++ b/.github/workflows/build-wayland-openvr.yml
@@ -18,10 +18,7 @@ jobs:
       uses: mozilla-actions/sccache-action@v0.0.9
     - name: Prepare Environment
       run: |
-        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 -y
-        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
+        .github/workflows/scripts/appimage_prepare_env.sh
     - name: Build
       run: cargo build --verbose --no-default-features --features=wayland,openvr
     - name: Run tests
diff --git a/.github/workflows/build-wayland-openxr-openvr-wayvr.yml b/.github/workflows/build-wayland-openxr-openvr-wayvr.yml
index c9b71d0..1bc3589 100644
--- a/.github/workflows/build-wayland-openxr-openvr-wayvr.yml
+++ b/.github/workflows/build-wayland-openxr-openvr-wayvr.yml
@@ -18,10 +18,7 @@ jobs:
       uses: mozilla-actions/sccache-action@v0.0.9
     - name: Prepare Environment
       run: |
-        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 -y
-        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
+        .github/workflows/scripts/appimage_prepare_env.sh
     - name: Build
       run: cargo build --verbose --no-default-features --features=wayland,openxr,openvr,wayvr
     - name: Run tests
diff --git a/.github/workflows/build-wayland-openxr.yml b/.github/workflows/build-wayland-openxr.yml
index c070305..1e64b24 100644
--- a/.github/workflows/build-wayland-openxr.yml
+++ b/.github/workflows/build-wayland-openxr.yml
@@ -18,10 +18,7 @@ jobs:
       uses: mozilla-actions/sccache-action@v0.0.9
     - name: Prepare Environment
       run: |
-        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 -y
-        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
+        .github/workflows/scripts/appimage_prepare_env.sh
     - name: Build
       run: cargo build --verbose --no-default-features --features=wayland,openxr
     - name: Run tests
diff --git a/.github/workflows/build-x11-openvr.yml b/.github/workflows/build-x11-openvr.yml
index b374161..86327a1 100644
--- a/.github/workflows/build-x11-openvr.yml
+++ b/.github/workflows/build-x11-openvr.yml
@@ -18,10 +18,7 @@ jobs:
       uses: mozilla-actions/sccache-action@v0.0.9
     - name: Prepare Environment
       run: |
-        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 -y
-        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
+        .github/workflows/scripts/appimage_prepare_env.sh
     - name: Build
       run: cargo build --verbose --no-default-features --features=x11,openvr
     - name: Run tests
diff --git a/.github/workflows/build-x11-openxr.yml b/.github/workflows/build-x11-openxr.yml
index b2e6c6e..be7f3d6 100644
--- a/.github/workflows/build-x11-openxr.yml
+++ b/.github/workflows/build-x11-openxr.yml
@@ -18,10 +18,7 @@ jobs:
       uses: mozilla-actions/sccache-action@v0.0.9
     - name: Prepare Environment
       run: |
-        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 -y
-        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
+        .github/workflows/scripts/appimage_prepare_env.sh
     - name: Build
       run: cargo build --verbose --no-default-features --features=x11,openxr
     - name: Run tests
diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index 70bdcfb..b1e6b2e 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -20,18 +20,7 @@ jobs:
         uses: mozilla-actions/sccache-action@v0.0.9
       - name: Prepare Environment
         run: |
-          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
-          rustup update
-          
-          test -f linuxdeploy-x86_64.AppImage || wget -q "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
-          chmod +x linuxdeploy-x86_64.AppImage
-          
-          test -d ${APPDIR} && rm -rf ${APPDIR}
-          mkdir -p ${APPDIR}/usr/bin 
-          
+          .github/workflows/scripts/appimage_prepare_env.sh
       - name: Cargo Build
         run: |
           cargo build --release
diff --git a/.github/workflows/scripts/appimage_prepare_env.sh b/.github/workflows/scripts/appimage_prepare_env.sh
index bcd2278..7b7f14f 100755
--- a/.github/workflows/scripts/appimage_prepare_env.sh
+++ b/.github/workflows/scripts/appimage_prepare_env.sh
@@ -6,8 +6,10 @@ 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
 
-test -f linuxdeploy-x86_64.AppImage || wget -q "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
-chmod +x linuxdeploy-x86_64.AppImage
+if [ "$APPDIR" != "" ]; then
+  test -f linuxdeploy-x86_64.AppImage || wget -q "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage"
+  chmod +x linuxdeploy-x86_64.AppImage
 
-test -d ${APPDIR} && rm -rf ${APPDIR}
-mkdir -p ${APPDIR}/usr/bin
+  test -d ${APPDIR} && rm -rf ${APPDIR}
+  mkdir -p ${APPDIR}/usr/bin
+fi