From f12babdf0b9c0861088e5c43d2610888cd0549cf Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sun, 25 Aug 2024 09:38:46 +0900
Subject: [PATCH 1/4] RPCS3: updated firmware to 4.91 [skip ci]

---
 functions/global.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/functions/global.sh b/functions/global.sh
index f00f6914..b0a62c0f 100644
--- a/functions/global.sh
+++ b/functions/global.sh
@@ -45,7 +45,7 @@ remote_network_target_2="$rd_repo"
 remote_network_target_3="https://one.one.one.one"                                                                     # The URL of a common internet target for testing network access
 helper_files_folder="$config/retrodeck/helper_files"                                                     # The parent folder of RetroDECK documentation files for deployment
 rd_appdata="/app/share/appdata/net.retrodeck.retrodeck.appdata.xml"                                                   # The shipped appdata XML file for this version
-rpcs3_firmware="http://dus01.ps3.update.playstation.net/update/ps3/image/us/2023_0228_05fe32f5dc8c78acbcd84d36ee7fdc5b/PS3UPDAT.PUP"
+rpcs3_firmware="http://dus01.ps3.update.playstation.net/update/ps3/image/us/2024_0227_3694eb3fb8d9915c112e6ab41a60c69f/PS3UPDAT.PUP"
 RA_API_URL="https://retroachievements.org/dorequest.php"                                                              # API URL for RetroAchievements.org
 presets_dir="$config/retrodeck/presets"                                                                  # Repository for all system preset config files
 git_organization_name="RetroDECK"                                                                       # The name of the organization in our git repository such as GitHub

From 16c2c2a50e3a2272fe17f0c804241365b058591f Mon Sep 17 00:00:00 2001
From: MonkeyX <tim@monkeyx.net>
Date: Sun, 25 Aug 2024 01:42:09 +0100
Subject: [PATCH 2/4] Removed need for BIOS tmp file for Godot (#919)

Co-authored-by: Rekku <rekku@retrodeck.net>
---
 functions/configurator_functions.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/functions/configurator_functions.sh b/functions/configurator_functions.sh
index 32f11a7f..db7f9c4d 100644
--- a/functions/configurator_functions.sh
+++ b/functions/configurator_functions.sh
@@ -5,10 +5,6 @@ check_bios_files() {
   # There is a "basic" and "expert" mode which outputs different levels of data
   # USAGE: check_bios_files "mode"
   
-  if [[ -f "$godot_bios_files_checked" ]]; then
-    rm -f "$godot_bios_files_checked" # Godot data transfer temp files
-  fi
-  touch "$godot_bios_files_checked"
 
   while IFS="^" read -r bios_file bios_subdir bios_hash bios_system bios_desc || [[ -n "$bios_file" ]];
     do
@@ -25,10 +21,10 @@ check_bios_files() {
         fi
         if [[ "$1" == "basic" ]]; then
           bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc")
-          echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc" >> "$godot_bios_files_checked" # Godot data transfer temp file
+          echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc" # Godot data transfer
         else
           bios_checked_list=("${bios_checked_list[@]}" "$bios_file" "$bios_system" "$bios_file_found" "$bios_hash_matched" "$bios_desc" "$bios_subdir" "$bios_hash")
-          echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc"^"$bios_subdir"^"$bios_hash" >> "$godot_bios_files_checked" # Godot data transfer temp file
+          echo "$bios_file"^"$bios_system"^"$bios_file_found"^"$bios_hash_matched"^"$bios_desc"^"$bios_subdir"^"$bios_hash" # Godot data transfer
         fi
       fi
   done < $bios_checklist

From feed0a1e581ac3af75060118337f4926fe128760 Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sun, 25 Aug 2024 14:02:05 +0900
Subject: [PATCH 3/4] WORKFLOW: reverting the pull_request_target as it was not
 building the PR code [skip ci]

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

diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 4e232e33..2994d14e 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -15,7 +15,7 @@ on:
      - '*.sh'
      - 'net.retrodeck.retrodeck.yml'
      - 'net.retrodeck.retrodeck.appdata.xml'
-  pull_request_target: 
+  pull_request: 
     branches:
      - cooker*
 

From bf619738f8e4f1e3e9bc7839e79bf6c0579bd7dd Mon Sep 17 00:00:00 2001
From: XargonWan <XargonWan@gmail.com>
Date: Sun, 25 Aug 2024 14:18:01 +0900
Subject: [PATCH 4/4] WORKFLOW: tentative solution for PRs [skip ci]

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

diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml
index 2994d14e..ba1f8785 100644
--- a/.github/workflows/cooker-selfhosted.yml
+++ b/.github/workflows/cooker-selfhosted.yml
@@ -15,7 +15,7 @@ on:
      - '*.sh'
      - 'net.retrodeck.retrodeck.yml'
      - 'net.retrodeck.retrodeck.appdata.xml'
-  pull_request: 
+  pull_request_target: 
     branches:
      - cooker*
 
@@ -56,6 +56,12 @@ jobs:
         with:
           submodules: 'true'
 
+      - name: Checkout PR branch (include changes)
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          git fetch origin +refs/pull/${{ github.event.pull_request.number }}/merge
+          git checkout -qf FETCH_HEAD
+        
       - name: "Install dependencies"
         run: "automation_tools/install_dependencies.sh"