From c1ffc755f0801d27102fa197ea618c7613d98591 Mon Sep 17 00:00:00 2001
From: Wouter Wijsman <wwijsman@live.nl>
Date: Wed, 12 Jun 2024 17:24:22 +0200
Subject: [PATCH 1/2] Add line to build.txt file

---
 .github/workflows/compilation.yml |  5 +++--
 .github/workflows/docker.yml      | 11 +++--------
 build-all.sh                      |  7 +++++++
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
index f435414..14863af 100644
--- a/.github/workflows/compilation.yml
+++ b/.github/workflows/compilation.yml
@@ -14,8 +14,6 @@ jobs:
       matrix:
         os: [[alpine, bash], [fedora, bash]]
     steps:
-    - uses: actions/checkout@v4
-
     - name: Install dependencies Alpine
       if: matrix.os[0] == 'alpine'
       run: |
@@ -26,8 +24,11 @@ jobs:
       run: |
         dnf -y install @development-tools g++ wget xz git autoconf automake python3 python3-pip cmake pkgconf libarchive-devel openssl-devel gpgme-devel libtool
 
+    - uses: actions/checkout@v4
+
     - name: Compile Tools
       run: |
+        chown -R $(id -nu):$(id -ng) .
         export PSPDEV=$PWD/pspdev
         export PATH=$PATH:$PSPDEV/bin
         ./build-all.sh
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 6fc83f2..c6ec4bd 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -13,14 +13,8 @@ jobs:
     runs-on: ubuntu-latest
   
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
-    - name: Set up QEMU
-      uses: docker/setup-qemu-action@v2
-      
-    - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v2
-      
     - name: Login to Github registry
       uses: docker/login-action@v2
       with:
@@ -28,8 +22,9 @@ jobs:
         password: ${{ secrets.GITHUB_TOKEN }}
         registry: ghcr.io
     
-    - uses: docker/build-push-action@v4
+    - uses: docker/build-push-action@v5
       with:
+        context: .
         push: true
         tags: ghcr.io/${{ github.repository }}:latest
     
diff --git a/build-all.sh b/build-all.sh
index aaab6b4..8a5a47e 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -46,3 +46,10 @@ else
   for SCRIPT in ${BUILD_SCRIPTS[@]}; do "$SCRIPT" "$TAG" || { echo "$SCRIPT: Failed."; exit 1; } done
 
 fi
+
+## Store build information
+BUILD_FILE="${PSPDEV}/build.txt"
+if [[ -f "${BUILD_FILE}" ]]; then
+  sed -i='' '/^psptoolchain-extra /d' "${BUILD_FILE}"
+fi
+git log -1 --format="psptoolchain-extra %H %cs" >> "${BUILD_FILE}"
\ No newline at end of file

From 2125bd183dc6915dc94b50857401d9ee7f01f082 Mon Sep 17 00:00:00 2001
From: Wouter Wijsman <wwijsman@live.nl>
Date: Sun, 16 Jun 2024 12:23:43 +0200
Subject: [PATCH 2/2] Add commit title to buid.txt

---
 build-all.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build-all.sh b/build-all.sh
index 8a5a47e..6b74efb 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -52,4 +52,4 @@ BUILD_FILE="${PSPDEV}/build.txt"
 if [[ -f "${BUILD_FILE}" ]]; then
   sed -i='' '/^psptoolchain-extra /d' "${BUILD_FILE}"
 fi
-git log -1 --format="psptoolchain-extra %H %cs" >> "${BUILD_FILE}"
\ No newline at end of file
+git log -1 --format="psptoolchain-extra %H %cs %s" >> "${BUILD_FILE}"