Merge pull request #22 from sharkwouter/main

Add line to build.txt file

.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

.github/workflows/docker.yml

@@ -13,23 +13,18 @@ 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:
         username: ${{ github.actor }}
         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
 

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 %s" >> "${BUILD_FILE}"