From f4d1f07396bb425a1178cb0655adb0c8b552baf5 Mon Sep 17 00:00:00 2001
From: Nick Fox <nick@foxsec.net>
Date: Mon, 25 Aug 2025 10:10:41 -0400
Subject: [PATCH 1/3] build against PR and push instead of master

---
 .github/workflows/linux-aur.yml | 34 ++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/linux-aur.yml b/.github/workflows/linux-aur.yml
index 5d14a468c..7c95d44ca 100644
--- a/.github/workflows/linux-aur.yml
+++ b/.github/workflows/linux-aur.yml
@@ -12,16 +12,24 @@ jobs:
     container:
       image: archlinux:latest
     steps:
-      - name: Install dependencies
-        run: | 
-          pacman -Syu --noconfirm --needed capstone curl ffmpeg freetype2 glfw libuv sdl2 zlib git make pkg-config sudo base-devel pacman-contrib
-      - name: Create builduser
-        run: |
-          useradd builduser -m
-          passwd -d builduser
-      - name: Build AUR Package
-        run: |
-          git clone https://aur.archlinux.org/pcsx-redux-git.git
-          chown -R builduser:builduser pcsx-redux-git
-          cd pcsx-redux-git
-          sudo -u builduser makepkg
+    - name: Update git
+      run: |
+        pacman -Syu --noconfirm git
+    - uses: actions/checkout@v3
+      with:
+        set-safe-directory: true
+    - name: Install dependencies
+      run: | 
+        pacman -Syu --noconfirm --needed capstone curl ffmpeg freetype2 glfw libuv sdl2 zlib git make pkg-config sudo base-devel pacman-contrib
+    - name: Create builduser
+      run: |
+        useradd builduser -m
+        passwd -d builduser
+    - name: Build AUR Package
+      run: |
+        mkdir /build
+        git clone https://aur.archlinux.org/pcsx-redux-git.git /build/pcsx-redux-git
+        chown -R builduser:builduser /build
+        cd /build/pcsx-redux-git
+        sed -i s,git+https://github.com/grumpycoders/pcsx-redux.git,git+file://$GITHUB_WORKSPACE#commit=$GITHUB_SHA,g PKGBUILD
+        sudo -u builduser makepkg

From 53326672dddf32409300934df6e12b365b03c714 Mon Sep 17 00:00:00 2001
From: Nick Fox <nick@foxsec.net>
Date: Mon, 25 Aug 2025 23:17:39 -0400
Subject: [PATCH 2/3] combine dependency updates/installation and fix
 indentation

---
 .github/workflows/linux-aur.yml | 39 +++++++++++++++------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/linux-aur.yml b/.github/workflows/linux-aur.yml
index 7c95d44ca..e749ce78e 100644
--- a/.github/workflows/linux-aur.yml
+++ b/.github/workflows/linux-aur.yml
@@ -12,24 +12,21 @@ jobs:
     container:
       image: archlinux:latest
     steps:
-    - name: Update git
-      run: |
-        pacman -Syu --noconfirm git
-    - uses: actions/checkout@v3
-      with:
-        set-safe-directory: true
-    - name: Install dependencies
-      run: | 
-        pacman -Syu --noconfirm --needed capstone curl ffmpeg freetype2 glfw libuv sdl2 zlib git make pkg-config sudo base-devel pacman-contrib
-    - name: Create builduser
-      run: |
-        useradd builduser -m
-        passwd -d builduser
-    - name: Build AUR Package
-      run: |
-        mkdir /build
-        git clone https://aur.archlinux.org/pcsx-redux-git.git /build/pcsx-redux-git
-        chown -R builduser:builduser /build
-        cd /build/pcsx-redux-git
-        sed -i s,git+https://github.com/grumpycoders/pcsx-redux.git,git+file://$GITHUB_WORKSPACE#commit=$GITHUB_SHA,g PKGBUILD
-        sudo -u builduser makepkg
+      - name: Install dependencies
+        run: |
+          pacman -Syu --noconfirm --needed git capstone curl ffmpeg freetype2 glfw libuv sdl2 zlib git make pkg-config sudo base-devel pacman-contrib
+      - uses: actions/checkout@v3
+        with:
+          set-safe-directory: true
+      - name: Create builduser
+        run: |
+          useradd builduser -m
+          passwd -d builduser
+      - name: Build AUR Package
+        run: |
+          mkdir /build
+          git clone https://aur.archlinux.org/pcsx-redux-git.git /build/pcsx-redux-git
+          chown -R builduser:builduser /build
+          cd /build/pcsx-redux-git
+          sed -i s,git+https://github.com/grumpycoders/pcsx-redux.git,git+file://$GITHUB_WORKSPACE#commit=$GITHUB_SHA,g PKGBUILD
+          sudo -u builduser makepkg

From bdaa1fe93c0fda1a449d83d4fed7b6239c5e2b1c Mon Sep 17 00:00:00 2001
From: Nick Fox <nick@foxsec.net>
Date: Mon, 25 Aug 2025 23:25:38 -0400
Subject: [PATCH 3/3] remove duplicate git dependency

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

diff --git a/.github/workflows/linux-aur.yml b/.github/workflows/linux-aur.yml
index e749ce78e..b2cc8b625 100644
--- a/.github/workflows/linux-aur.yml
+++ b/.github/workflows/linux-aur.yml
@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Install dependencies
         run: |
-          pacman -Syu --noconfirm --needed git capstone curl ffmpeg freetype2 glfw libuv sdl2 zlib git make pkg-config sudo base-devel pacman-contrib
+          pacman -Syu --noconfirm --needed capstone curl ffmpeg freetype2 glfw libuv sdl2 zlib git make pkg-config sudo base-devel pacman-contrib
       - uses: actions/checkout@v3
         with:
           set-safe-directory: true