From 4d26bf1aa4f700804e130695abd6ff5703a78230 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sat, 13 Jan 2024 21:46:08 -0600
Subject: [PATCH 01/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 8f3f7ea500cf..70198a83f2a8 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -15,7 +15,9 @@ concurrency:
 
 jobs:
   vita-template:
-    runs-on: "ubuntu-20.04"
+    runs-on: ubuntu-latest
+    container: vitasdk/vitasdk
+
     name: Template (target=release, tools=no)
 
     steps:
@@ -27,6 +29,7 @@ jobs:
           sudo rm -f /etc/apt/sources.list.d/*
           sudo cp -f misc/ci/sources.list /etc/apt/sources.list
           sudo apt-get update
+
       - name: Setup Godot build cache
         uses: ./.github/actions/godot-cache
         continue-on-error: true
@@ -34,19 +37,6 @@ jobs:
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
 
-      - name: Setup VitaSDK
-        run: |
-          sudo apt-get install cmake libarchive-tools fakeroot zip -y
-          git clone https://github.com/vitasdk/vdpm
-          git clone https://github.com/isage/vita-packages-extra
-          cd vdpm
-          ./bootstrap-vitasdk.sh
-          ./install-all.sh
-          export PATH=$VITASDK/bin:$PATH
-          vdpm vita-rss-libdl
-          cd ../vita-packages-extra/pvr_psp2
-          vita-makepkg
-          vdpm *-arm.tar.xz
       - name: Compilation
         uses: ./.github/actions/godot-build
         with:

From 6ef3bb81151a84d4882b2cc9a11ea6fd24c8436d Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sat, 13 Jan 2024 21:48:38 -0600
Subject: [PATCH 02/25] Update switch_builds.yml

---
 .github/workflows/switch_builds.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/switch_builds.yml b/.github/workflows/switch_builds.yml
index 5353e7226fb0..a6f57396c958 100644
--- a/.github/workflows/switch_builds.yml
+++ b/.github/workflows/switch_builds.yml
@@ -29,11 +29,8 @@ jobs:
             ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
             ${{github.job}}-${{env.GODOT_BASE_BRANCH}}
 
-      - name: Install scons from pip
-        run: |
-          sudo apt-get update
-          sudo apt-get -y install python3-pip
-          sudo python3 -m pip install scons
+      - name: Setup python and scons
+        uses: ./.github/actions/godot-deps
 
       - name: Compilation
         env:

From 5fe26b9d38e9230ead716a92353199793b780c0e Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sat, 13 Jan 2024 21:55:58 -0600
Subject: [PATCH 03/25] Update switch_builds.yml

---
 .github/workflows/switch_builds.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/switch_builds.yml b/.github/workflows/switch_builds.yml
index a6f57396c958..a7eeb36e6350 100644
--- a/.github/workflows/switch_builds.yml
+++ b/.github/workflows/switch_builds.yml
@@ -5,6 +5,7 @@ on:
 # Global Cache Settings
 env:
   GODOT_BASE_BRANCH: 3.5
+  SCONSFLAGS: verbose=yes warnings=all werror=no debug_symbols=no
   SCONS_CACHE_LIMIT: 4096
 
 jobs:
@@ -33,10 +34,12 @@ jobs:
         uses: ./.github/actions/godot-deps
 
       - name: Compilation
-        env:
-          SCONS_CACHE: ${{github.workspace}}/.scons_cache/
-        run: |
-          scons -j2 verbose=yes warnings=all werror=no platform=switch target=release tools=no
+        uses: ./.github/actions/godot-build
+        with:
+          sconsflags: ${{ env.SCONSFLAGS }}
+          platform: switch
+          target: release
+          tools: false
 
       - uses: actions/upload-artifact@v2
         with:

From 52383532f8fa17b476e513f201d6a87e3a0d1480 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sat, 13 Jan 2024 21:57:23 -0600
Subject: [PATCH 04/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 70198a83f2a8..06e2b58c8bc6 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -23,13 +23,6 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      # Azure repositories are not reliable, we need to prevent azure giving us packages.
-      - name: Make apt sources.list use the default Ubuntu repositories
-        run: |
-          sudo rm -f /etc/apt/sources.list.d/*
-          sudo cp -f misc/ci/sources.list /etc/apt/sources.list
-          sudo apt-get update
-
       - name: Setup Godot build cache
         uses: ./.github/actions/godot-cache
         continue-on-error: true

From 55d9843e4c4ddd87cbaeace2c9c6900350f6a04a Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sat, 13 Jan 2024 21:57:45 -0600
Subject: [PATCH 05/25] Update switch_builds.yml

---
 .github/workflows/switch_builds.yml | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/switch_builds.yml b/.github/workflows/switch_builds.yml
index a7eeb36e6350..26e22292b433 100644
--- a/.github/workflows/switch_builds.yml
+++ b/.github/workflows/switch_builds.yml
@@ -18,17 +18,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      # Upload cache on completion and check it out now
-      - name: Load .scons_cache directory
-        id: switch-template-cache
-        uses: actions/cache@v2
-        with:
-          path: ${{github.workspace}}/.scons_cache/
-          key: ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-          restore-keys: |
-            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}-${{github.sha}}
-            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}-${{github.ref}}
-            ${{github.job}}-${{env.GODOT_BASE_BRANCH}}
+      - name: Setup Godot build cache
+        uses: ./.github/actions/godot-cache
+        continue-on-error: true
 
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps

From c407f8db7da72e27a0b813a43b0dc52ae40c8040 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sat, 13 Jan 2024 22:04:28 -0600
Subject: [PATCH 06/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 06e2b58c8bc6..3392efa7e328 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -6,8 +6,6 @@ on:
 env:
   GODOT_BASE_BRANCH: 3.5
   SCONSFLAGS: verbose=yes warnings=all werror=no debug_symbols=no
-  VITASDK: /usr/local/vitasdk
-  EUID: 1 makepkg
 
 concurrency:
   group: ci-${{github.actor}}-${{github.head_ref || github.run_number}}-${{github.ref}}-vita

From 18292322c07c43dbe6fcae6abfc35956b68cb02c Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sat, 13 Jan 2024 22:06:57 -0600
Subject: [PATCH 07/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 3392efa7e328..5285aaa2fc8d 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   vita-template:
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-20.04"
     container: vitasdk/vitasdk
 
     name: Template (target=release, tools=no)

From 5d42853c16e944fc5840b4073e045c7feceebdbe Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sat, 13 Jan 2024 22:07:09 -0600
Subject: [PATCH 08/25] Update switch_builds.yml

---
 .github/workflows/switch_builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/switch_builds.yml b/.github/workflows/switch_builds.yml
index 26e22292b433..5daf3fafcd66 100644
--- a/.github/workflows/switch_builds.yml
+++ b/.github/workflows/switch_builds.yml
@@ -10,7 +10,7 @@ env:
 
 jobs:
   switch-template:
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-20.04"
     container: devkitpro/devkita64
 
     name: Template (target=release, tools=no)

From ddd9409a6ceb87128d262bc36bf21bfc92fcd9f2 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sat, 13 Jan 2024 22:39:05 -0600
Subject: [PATCH 09/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 5285aaa2fc8d..c34553ae83f4 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -23,11 +23,20 @@ jobs:
 
       - name: Setup Godot build cache
         uses: ./.github/actions/godot-cache
+        with:
+          cache-name: vita-template
         continue-on-error: true
 
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
 
+      - name: Setup PVR_PSP2
+        run: |
+          git clone https://github.com/isage/vita-packages-extra
+          cd vita-packages-extra/pvr_psp2
+          vita-makepkg
+          vdpm *-arm.tar.xz
+
       - name: Compilation
         uses: ./.github/actions/godot-build
         with:

From 438aca0b2bc5b6b43b48d728b031416da3bd702c Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sat, 13 Jan 2024 22:39:28 -0600
Subject: [PATCH 10/25] Update switch_builds.yml

---
 .github/workflows/switch_builds.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/switch_builds.yml b/.github/workflows/switch_builds.yml
index 5daf3fafcd66..fd7170247e11 100644
--- a/.github/workflows/switch_builds.yml
+++ b/.github/workflows/switch_builds.yml
@@ -20,6 +20,8 @@ jobs:
 
       - name: Setup Godot build cache
         uses: ./.github/actions/godot-cache
+        with:
+          cache-name: switch-template
         continue-on-error: true
 
       - name: Setup python and scons

From e5a307305bd277c8306f9558ca2f75358baf0327 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sat, 13 Jan 2024 23:25:52 -0600
Subject: [PATCH 11/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index c34553ae83f4..8e05b48d95f6 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -13,7 +13,7 @@ concurrency:
 
 jobs:
   vita-template:
-    runs-on: "ubuntu-20.04"
+    runs-on: ubuntu-latest
     container: vitasdk/vitasdk
 
     name: Template (target=release, tools=no)

From 122b4059b15034ecc20086b01034c18be880e093 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 08:45:49 -0600
Subject: [PATCH 12/25] Update switch_builds.yml

---
 .github/workflows/switch_builds.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/switch_builds.yml b/.github/workflows/switch_builds.yml
index fd7170247e11..1f0c2835499a 100644
--- a/.github/workflows/switch_builds.yml
+++ b/.github/workflows/switch_builds.yml
@@ -35,8 +35,5 @@ jobs:
           target: release
           tools: false
 
-      - uses: actions/upload-artifact@v2
-        with:
-          name: ${{ github.job }}
-          path: bin/*
-          retention-days: 14
+      - name: Upload artifact
+        uses: ./.github/actions/upload-artifact

From 60f5f9cf54bea3700e72ce6ccaaf9b00d214b543 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 08:58:43 -0600
Subject: [PATCH 13/25] Update action.yml

---
 .github/actions/godot-deps/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/godot-deps/action.yml b/.github/actions/godot-deps/action.yml
index 38731db5d6b2..881eb7d1f683 100644
--- a/.github/actions/godot-deps/action.yml
+++ b/.github/actions/godot-deps/action.yml
@@ -12,7 +12,7 @@ runs:
   steps:
     # Use python 3.x release (works cross platform)
     - name: Set up Python 3.x
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5
       with:
         # Semantic version range syntax or exact version of a Python version
         python-version: ${{ inputs.python-version }}

From 10f7f15c0064ec34f251783484cb35796cb7d9a6 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 09:06:29 -0600
Subject: [PATCH 14/25] Update action.yml

---
 .github/actions/godot-deps/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/godot-deps/action.yml b/.github/actions/godot-deps/action.yml
index 881eb7d1f683..943771d22ba3 100644
--- a/.github/actions/godot-deps/action.yml
+++ b/.github/actions/godot-deps/action.yml
@@ -11,7 +11,7 @@ runs:
   using: "composite"
   steps:
     # Use python 3.x release (works cross platform)
-    - name: Set up Python 3.x
+    - name: Set up Python ${{ inputs.python-version }}
       uses: actions/setup-python@v5
       with:
         # Semantic version range syntax or exact version of a Python version

From ea37f3bc7c2247697f8a545a94ca8a3e633e4512 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 09:06:48 -0600
Subject: [PATCH 15/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 8e05b48d95f6..759347682204 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -14,7 +14,7 @@ concurrency:
 jobs:
   vita-template:
     runs-on: ubuntu-latest
-    container: vitasdk/vitasdk
+    # container: vitasdk/vitasdk
 
     name: Template (target=release, tools=no)
 

From 93966495761c75462b19a4baf14ce2d2cdbf1043 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 09:35:27 -0600
Subject: [PATCH 16/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 759347682204..d186c8b12b46 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -14,7 +14,6 @@ concurrency:
 jobs:
   vita-template:
     runs-on: ubuntu-latest
-    # container: vitasdk/vitasdk
 
     name: Template (target=release, tools=no)
 
@@ -30,10 +29,17 @@ jobs:
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
 
-      - name: Setup PVR_PSP2
+      - name: Setup VitaSDK and PVR_PSP2
         run: |
+          sudo apt-get install cmake libarchive-tools fakeroot zip -y
+          git clone https://github.com/vitasdk/vdpm
           git clone https://github.com/isage/vita-packages-extra
-          cd vita-packages-extra/pvr_psp2
+          cd vdpm
+          ./bootstrap-vitasdk.sh
+          ./install-all.sh
+          export PATH=$VITASDK/bin:$PATH
+          vdpm vita-rss-libdl
+          cd ../vita-packages-extra/pvr_psp2
           vita-makepkg
           vdpm *-arm.tar.xz
 

From 412d8a1fc68b6ee5cb3068946cf367d04dabfba7 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 09:44:46 -0600
Subject: [PATCH 17/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index d186c8b12b46..e7f8144e2999 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -13,7 +13,8 @@ concurrency:
 
 jobs:
   vita-template:
-    runs-on: ubuntu-latest
+    runs-on: "ubuntu-20.04"
+    container: gnuton/vitasdk-docker
 
     name: Template (target=release, tools=no)
 
@@ -29,17 +30,11 @@ jobs:
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
 
-      - name: Setup VitaSDK and PVR_PSP2
+      - name: Setup PVR_PSP2
         run: |
           sudo apt-get install cmake libarchive-tools fakeroot zip -y
-          git clone https://github.com/vitasdk/vdpm
           git clone https://github.com/isage/vita-packages-extra
-          cd vdpm
-          ./bootstrap-vitasdk.sh
-          ./install-all.sh
-          export PATH=$VITASDK/bin:$PATH
-          vdpm vita-rss-libdl
-          cd ../vita-packages-extra/pvr_psp2
+          cd vita-packages-extra/pvr_psp2
           vita-makepkg
           vdpm *-arm.tar.xz
 

From f98fa683f9327e5a5a6e6ecb309ef3954ed74873 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 09:50:12 -0600
Subject: [PATCH 18/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index e7f8144e2999..4c44920403ec 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -27,12 +27,13 @@ jobs:
           cache-name: vita-template
         continue-on-error: true
 
+      - run: sudo apt-get install cmake libarchive-tools fakeroot zip -y
+
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
 
       - name: Setup PVR_PSP2
         run: |
-          sudo apt-get install cmake libarchive-tools fakeroot zip -y
           git clone https://github.com/isage/vita-packages-extra
           cd vita-packages-extra/pvr_psp2
           vita-makepkg

From 11b0c551bee33eb27ced8636675f8a6dbe88a271 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 09:55:40 -0600
Subject: [PATCH 19/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 4c44920403ec..1bffd6caea44 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -27,13 +27,19 @@ jobs:
           cache-name: vita-template
         continue-on-error: true
 
-      - run: sudo apt-get install cmake libarchive-tools fakeroot zip -y
+      # Azure repositories are not reliable, we need to prevent Azure giving us packages.
+      - name: Make apt sources.list use the default Ubuntu repositories
+        run: |
+          sudo rm -f /etc/apt/sources.list.d/*
+          sudo cp -f misc/ci/sources.list /etc/apt/sources.list
+          sudo apt-get update
 
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
 
       - name: Setup PVR_PSP2
         run: |
+          sudo apt-get install cmake libarchive-tools fakeroot zip -y
           git clone https://github.com/isage/vita-packages-extra
           cd vita-packages-extra/pvr_psp2
           vita-makepkg

From 2219970f1034bc2d358a6508186e4445db7dfbf3 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 12:07:43 -0600
Subject: [PATCH 20/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 1bffd6caea44..3ce4b1a937f5 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -14,7 +14,7 @@ concurrency:
 jobs:
   vita-template:
     runs-on: "ubuntu-20.04"
-    container: gnuton/vitasdk-docker
+    container: halotroop2288/vitasdk-ubuntu
 
     name: Template (target=release, tools=no)
 

From 86eed54d43c84e5c9abac3708124afc7d0be471a Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 12:22:58 -0600
Subject: [PATCH 21/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 3ce4b1a937f5..c0f2595e751a 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -14,7 +14,7 @@ concurrency:
 jobs:
   vita-template:
     runs-on: "ubuntu-20.04"
-    container: halotroop2288/vitasdk-ubuntu
+    container: halotroop2288/vitasdk-ubuntu@main
 
     name: Template (target=release, tools=no)
 

From 9a39d78a5bb6502bf170c846ead6579b17c91150 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 12:23:58 -0600
Subject: [PATCH 22/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index c0f2595e751a..3ce4b1a937f5 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -14,7 +14,7 @@ concurrency:
 jobs:
   vita-template:
     runs-on: "ubuntu-20.04"
-    container: halotroop2288/vitasdk-ubuntu@main
+    container: halotroop2288/vitasdk-ubuntu
 
     name: Template (target=release, tools=no)
 

From 05dfb054f9a71ab9ab7631a23c84fb57ef46ed26 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 12:32:02 -0600
Subject: [PATCH 23/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index 3ce4b1a937f5..b045d92b980c 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -39,7 +39,6 @@ jobs:
 
       - name: Setup PVR_PSP2
         run: |
-          sudo apt-get install cmake libarchive-tools fakeroot zip -y
           git clone https://github.com/isage/vita-packages-extra
           cd vita-packages-extra/pvr_psp2
           vita-makepkg

From c9ec67d3061bc8f9177d1cbc9040229fc6b63f75 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 13:27:01 -0600
Subject: [PATCH 24/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index b045d92b980c..eff27f7adbad 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -27,18 +27,12 @@ jobs:
           cache-name: vita-template
         continue-on-error: true
 
-      # Azure repositories are not reliable, we need to prevent Azure giving us packages.
-      - name: Make apt sources.list use the default Ubuntu repositories
-        run: |
-          sudo rm -f /etc/apt/sources.list.d/*
-          sudo cp -f misc/ci/sources.list /etc/apt/sources.list
-          sudo apt-get update
-
       - name: Setup python and scons
         uses: ./.github/actions/godot-deps
 
       - name: Setup PVR_PSP2
         run: |
+          sudo -u user zsh
           git clone https://github.com/isage/vita-packages-extra
           cd vita-packages-extra/pvr_psp2
           vita-makepkg

From 4a5746d7cbec324a48d575a0b04949764ca68053 Mon Sep 17 00:00:00 2001
From: Caroline Joy Bell <halotroop2288@proton.me>
Date: Sun, 14 Jan 2024 13:31:50 -0600
Subject: [PATCH 25/25] Update vita_builds.yml

---
 .github/workflows/vita_builds.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/vita_builds.yml b/.github/workflows/vita_builds.yml
index eff27f7adbad..9e50d6f6c0d0 100644
--- a/.github/workflows/vita_builds.yml
+++ b/.github/workflows/vita_builds.yml
@@ -32,7 +32,7 @@ jobs:
 
       - name: Setup PVR_PSP2
         run: |
-          sudo -u user zsh
+          su user
           git clone https://github.com/isage/vita-packages-extra
           cd vita-packages-extra/pvr_psp2
           vita-makepkg