From d2f76827e36afc98736f1474e4ab044f6a9e2dd8 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 09:13:34 +1100
Subject: [PATCH 01/16] Test Arm build

---
 .github/workflows/c-cpp.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 3f7accb..0a6f4ec 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -62,3 +62,19 @@ jobs:
       with:
         name: macos-binaries
         path: artifact
+
+  build-macos-arm:
+    runs-on: macos-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Make binaries
+      run: |
+        # export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/
+        make CXX='clang++ -std=c++11'
+    - name: Prepare Artifacts
+      run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: macos-binaries
+        path: artifact

From 1a1b1a460334fa639e1dca6b86c84e5a5d6af501 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 09:20:26 +1100
Subject: [PATCH 02/16] Bump everything up to v4 and separate macos builds

---
 .github/workflows/c-cpp.yml | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 0a6f4ec..16e28cf 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -12,13 +12,13 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Make binaries
       run: make
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: linux-binaries
         path: artifact
@@ -29,52 +29,51 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: msys2/setup-msys2@v2
+      - uses: msys2/setup-msys2@v4
         with:
              install: >-
                 base-devel
                 git
                 mingw-w64-x86_64-clang
                 mingw-w64-x86_64-openssl
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Makes Binaries
         run: make EXTRA_FLAG=-static
       - name: Prepare Artifacts
         run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.
       - name: Upload Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: windows-binaries
           path: artifact
         
-  build-macos:
-    runs-on: macos-latest
+  build-macos-x86:
+    runs-on: macos-12
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Make binaries
       run: |
-        export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/
+        # export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/
         make CXX='clang++ -std=c++11'
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: macos-binaries
+        name: macos-intel-binaries
         path: artifact
 
   build-macos-arm:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Make binaries
       run: |
-        # export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/
         make CXX='clang++ -std=c++11'
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.
     - name: Upload Artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
-        name: macos-binaries
+        name: macos-silicon-binary
         path: artifact

From 2071687de1f911a918bb6953756ec3511e838311 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 09:26:33 +1100
Subject: [PATCH 03/16] macos-latest tag does not appear to work for ARM builds

---
 .github/workflows/c-cpp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 16e28cf..80732c2 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -29,7 +29,7 @@ jobs:
       run:
         shell: msys2 {0}
     steps:
-      - uses: msys2/setup-msys2@v4
+      - uses: msys2/setup-msys2@v2
         with:
              install: >-
                 base-devel
@@ -64,7 +64,7 @@ jobs:
         path: artifact
 
   build-macos-arm:
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
     - name: Make binaries

From bc1325292f11e2c8780fc2e13d6e5ff4f8afcbc8 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 09:33:31 +1100
Subject: [PATCH 04/16] Fix include paths

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

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 80732c2..203e6b4 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -69,6 +69,8 @@ jobs:
     - uses: actions/checkout@v4
     - name: Make binaries
       run: |
+        export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix openssl)/lib
+        export INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
         make CXX='clang++ -std=c++11'
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.

From 97c87d338deaea23bdccb3c5979691f008029bda Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 09:37:18 +1100
Subject: [PATCH 05/16] Test if brew works

---
 .github/workflows/c-cpp.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 203e6b4..08b1b96 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -71,6 +71,7 @@ jobs:
       run: |
         export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix openssl)/lib
         export INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
+        brew --prefix openssl
         make CXX='clang++ -std=c++11'
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.

From cd88d5436f18e70b54f49c73ce8415ccb66e28f6 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 09:39:41 +1100
Subject: [PATCH 06/16] CPLUS_INCLUDE_PATH DUH

---
 .github/workflows/c-cpp.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 08b1b96..bd08935 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -70,8 +70,7 @@ jobs:
     - name: Make binaries
       run: |
         export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix openssl)/lib
-        export INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
-        brew --prefix openssl
+        export CPLUS_INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
         make CXX='clang++ -std=c++11'
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.

From fd1a8dddb8fa5cc4a2f80fdb7ab26fa9419f514b Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 09:47:12 +1100
Subject: [PATCH 07/16] Make brew actions same on intel and silicon

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

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index bd08935..d8103e8 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -53,7 +53,8 @@ jobs:
     - uses: actions/checkout@v4
     - name: Make binaries
       run: |
-        # export LIBRARY_PATH=$LIBRARY_PATH:/usr/local/opt/openssl/lib/
+        export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix openssl)/lib
+        export CPLUS_INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
         make CXX='clang++ -std=c++11'
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.

From 3b8a1ed8b2c5e3d6980dc53600ed5158cbdc22de Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 13:52:25 +1100
Subject: [PATCH 08/16] Test Universal binary

---
 .github/workflows/c-cpp.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index d8103e8..63c4a0e 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -64,7 +64,7 @@ jobs:
         name: macos-intel-binaries
         path: artifact
 
-  build-macos-arm:
+  build-macos-universal:
     runs-on: macos-14
     steps:
     - uses: actions/checkout@v4
@@ -72,11 +72,13 @@ jobs:
       run: |
         export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix openssl)/lib
         export CPLUS_INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
-        make CXX='clang++ -std=c++11'
+        make CXX='clang++ -std=c++11 -target arm64-apple-darwin20.1.0 -o pspdecrypt-arm64'
+        make CXX='clang++ -std=c++11 -target x86_64-apple-darwin-macho -o pspdecrypt-x86_64'
+        lipo pspdecrypt-arm64 pspdecrypt-x86_64 -o pspdecrypt
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.
     - name: Upload Artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: macos-silicon-binary
+        name: macos-universal-binary
         path: artifact

From 225eba59a20f5d1d97d08b490b0b8e5afc403dc7 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 13:55:43 +1100
Subject: [PATCH 09/16] Fix lipo command

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

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 63c4a0e..106aa4f 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -74,7 +74,7 @@ jobs:
         export CPLUS_INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
         make CXX='clang++ -std=c++11 -target arm64-apple-darwin20.1.0 -o pspdecrypt-arm64'
         make CXX='clang++ -std=c++11 -target x86_64-apple-darwin-macho -o pspdecrypt-x86_64'
-        lipo pspdecrypt-arm64 pspdecrypt-x86_64 -o pspdecrypt
+        lipo pspdecrypt-arm64 pspdecrypt-x86_64 -create -output pspdecrypt
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.
     - name: Upload Artifacts

From e1760b3ff7bca087ceb0f11953c9bea1fd999602 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 13:59:12 +1100
Subject: [PATCH 10/16] Make clean in between?

---
 .github/workflows/c-cpp.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 106aa4f..b80bc30 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -73,6 +73,7 @@ jobs:
         export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix openssl)/lib
         export CPLUS_INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
         make CXX='clang++ -std=c++11 -target arm64-apple-darwin20.1.0 -o pspdecrypt-arm64'
+        make clean
         make CXX='clang++ -std=c++11 -target x86_64-apple-darwin-macho -o pspdecrypt-x86_64'
         lipo pspdecrypt-arm64 pspdecrypt-x86_64 -create -output pspdecrypt
     - name: Prepare Artifacts

From 4a80fc4c1380ffa09a96d3abd6eb94a1f4c7cd35 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 14:19:46 +1100
Subject: [PATCH 11/16] Universal Build test

---
 .github/workflows/c-cpp.yml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index b80bc30..a112862 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -55,7 +55,7 @@ jobs:
       run: |
         export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix openssl)/lib
         export CPLUS_INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
-        make CXX='clang++ -std=c++11'
+        make CXX='clang++ -std=c++11 -target x86_64-apple-darwin-macho -o pspdecrypt-x86_64'
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.
     - name: Upload Artifacts
@@ -73,9 +73,16 @@ jobs:
         export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix openssl)/lib
         export CPLUS_INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
         make CXX='clang++ -std=c++11 -target arm64-apple-darwin20.1.0 -o pspdecrypt-arm64'
-        make clean
-        make CXX='clang++ -std=c++11 -target x86_64-apple-darwin-macho -o pspdecrypt-x86_64'
+    - name: Download Artifact
+      uses: actions/download-artifact@v2
+      with:
+        name: macos-intel-binaries
+        path: artifact
+    - name: Make Universal Binary
+      run: |
+        unzip macos-intel-binaries.zip
         lipo pspdecrypt-arm64 pspdecrypt-x86_64 -create -output pspdecrypt
+
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.
     - name: Upload Artifacts

From 60bfc45a3b9fe6be60ba92756747f095d8275065 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 14:22:21 +1100
Subject: [PATCH 12/16] Set requirement for universal binary

---
 .github/workflows/c-cpp.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index a112862..19ff8fc 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -65,6 +65,7 @@ jobs:
         path: artifact
 
   build-macos-universal:
+    needs: build-macos-x86
     runs-on: macos-14
     steps:
     - uses: actions/checkout@v4

From 119b69bf242fba8794e4049f072cfaa13e4fec52 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 14:24:17 +1100
Subject: [PATCH 13/16] Fix artifact path?

---
 .github/workflows/c-cpp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 19ff8fc..db5c74d 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -75,13 +75,13 @@ jobs:
         export CPLUS_INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
         make CXX='clang++ -std=c++11 -target arm64-apple-darwin20.1.0 -o pspdecrypt-arm64'
     - name: Download Artifact
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v4
       with:
         name: macos-intel-binaries
         path: artifact
     - name: Make Universal Binary
       run: |
-        unzip macos-intel-binaries.zip
+        unzip artifact/macos-intel-binaries.zip
         lipo pspdecrypt-arm64 pspdecrypt-x86_64 -create -output pspdecrypt
 
     - name: Prepare Artifacts

From cac27826aa900ace6ae71b4f1b209c0f5c434238 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 14:27:49 +1100
Subject: [PATCH 14/16] Artifact dir is elsewehre..

---
 .github/workflows/c-cpp.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index db5c74d..368cc2a 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -55,7 +55,7 @@ jobs:
       run: |
         export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix openssl)/lib
         export CPLUS_INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
-        make CXX='clang++ -std=c++11 -target x86_64-apple-darwin-macho -o pspdecrypt-x86_64'
+        make CXX='clang++ -std=c++11 -target x86_64-apple-darwin-macho'
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.
     - name: Upload Artifacts
@@ -81,8 +81,7 @@ jobs:
         path: artifact
     - name: Make Universal Binary
       run: |
-        unzip artifact/macos-intel-binaries.zip
-        lipo pspdecrypt-arm64 pspdecrypt-x86_64 -create -output pspdecrypt
+        lipo pspdecrypt-arm64 ~/work/pspdecrypt/pspdecrypt/artifact/pspdecrypt -create -output pspdecrypt
 
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.

From 7e2ec5478ea79c15bf3b89a6bea77ff076abe213 Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 14:31:32 +1100
Subject: [PATCH 15/16] Bah

---
 .github/workflows/c-cpp.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 368cc2a..0794bd0 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -73,7 +73,7 @@ jobs:
       run: |
         export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix openssl)/lib
         export CPLUS_INCLUDE_PATH=$INCLUDE_PATH:$(brew --prefix openssl)/include
-        make CXX='clang++ -std=c++11 -target arm64-apple-darwin20.1.0 -o pspdecrypt-arm64'
+        make CXX='clang++ -std=c++11 -target arm64-apple-darwin20.1.0'
     - name: Download Artifact
       uses: actions/download-artifact@v4
       with:
@@ -81,7 +81,7 @@ jobs:
         path: artifact
     - name: Make Universal Binary
       run: |
-        lipo pspdecrypt-arm64 ~/work/pspdecrypt/pspdecrypt/artifact/pspdecrypt -create -output pspdecrypt
+        lipo pspdecrypt ~/work/pspdecrypt/pspdecrypt/artifact/pspdecrypt -create -output pspdecrypt
 
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.

From 367c4e8a54ff9cbedf372983062e032e950e73cc Mon Sep 17 00:00:00 2001
From: Wally4000 <catapultit@me.com>
Date: Fri, 5 Apr 2024 14:37:39 +1100
Subject: [PATCH 16/16] Remove artifact directory after ub is built

---
 .github/workflows/c-cpp.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
index 0794bd0..3767957 100644
--- a/.github/workflows/c-cpp.yml
+++ b/.github/workflows/c-cpp.yml
@@ -82,6 +82,7 @@ jobs:
     - name: Make Universal Binary
       run: |
         lipo pspdecrypt ~/work/pspdecrypt/pspdecrypt/artifact/pspdecrypt -create -output pspdecrypt
+        rm -rf ~/work/pspdecrypt/pspdecrypt/artifact/
 
     - name: Prepare Artifacts
       run: mkdir artifact && mv pspdecrypt artifact/. && cp Readme.md artifact/.