Add caching to github workflow

Now, the workflow doesn't download tarballs on every run.

Author: Peter0x44

.github/workflows/build.yml

@@ -1,5 +1,9 @@
 name: Build and test
 
+concurrency:
+  group: w64devkit-${{ github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request: {}
   push:
@@ -25,6 +29,9 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Apply x86 patch
         if: matrix.arch == 'x86'
         run: patch -p1 -i src/variant-x86.patch
@@ -38,16 +45,26 @@ jobs:
           echo "version=${GIT_VERSION:1}" >> $GITHUB_OUTPUT
           echo "archive=w64devkit-$ARCH-${GIT_VERSION:1}" >> $GITHUB_OUTPUT
 
-      - name: Build
+      - name: Build and extract artifact
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          target: dist
+          outputs: type=local,dest=.
+          cache-from: type=gha,scope=w64devkit-${{ matrix.arch }}
+          cache-to: type=gha,scope=w64devkit-${{ matrix.arch }},mode=max
+          
+      - name: Rename artifact
         run: |
-          docker build -t w64devkit .
-          docker run --rm w64devkit > ${{ steps.filename.outputs.archive }}.exe
+          mv w64devkit.exe ${{ steps.filename.outputs.archive }}.exe
+          ls -lh ${{ steps.filename.outputs.archive }}.exe
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ steps.filename.outputs.archive }}
-          path: w64devkit-*.exe
+          name: ${{ steps.filename.outputs.archive }}.exe
+          path: ${{ steps.filename.outputs.archive }}.exe
+          compression-level: 0
 
       - name: Create Release
         if: startsWith(github.ref, 'refs/tags/')

Dockerfile

@@ -1,4 +1,4 @@
-FROM debian:bookworm-slim
+FROM debian:bookworm-slim AS builder
 
 ARG VERSION=2.4.0
 ARG PREFIX=/w64devkit
@@ -523,6 +523,11 @@ RUN printf "id ICON \"$PREFIX/src/w64devkit.ico\"" >w64devkit.rc \
  && cat /mingw-w64-v$MINGW_VERSION/mingw-w64-libraries/winpthreads/COPYING \
         >>$PREFIX/COPYING.MinGW-w64-runtime.txt \
  && echo $VERSION >$PREFIX/VERSION.txt \
- && 7z a -mx=9 -mtm=- $PREFIX.7z $PREFIX
+ && 7z a -mx=9 -mtm=- $PREFIX.7z $PREFIX \
+ && cat /7z/7z.sfx $PREFIX.7z > /w64devkit.exe
 ENV PREFIX=${PREFIX}
 CMD cat /7z/7z.sfx $PREFIX.7z
+
+# Minimal stage for CI artifact extraction (optional, doesn't affect default build)
+FROM scratch AS dist
+COPY --from=builder /w64devkit.exe /w64devkit.exe

README.md

@@ -22,7 +22,7 @@ building the kit itself.
 
 Build the image, then run it to produce a self-extracting 7z archive:
 
-    docker build -t w64devkit .
+    docker build --target builder -t w64devkit .
     docker run --rm w64devkit >w64devkit-x64.exe
 
 This takes about 15 minutes on modern systems. You will need an internet