From c308f151ef2081dfd3992f0c62f2672b6cbac864 Mon Sep 17 00:00:00 2001
From: Christopher Wellons <wellons@nullprogram.com>
Date: Sat, 29 Aug 2026 14:17:11 -0400
Subject: [PATCH] Use x86 build args instead of the patch in CI

The variant patch no longer exists, so both x86 builds read
src/variant-x86.args into a step output, which build-push-action
accepts verbatim as its newline-delimited build-args input. The args
file remains the single definition of the variant.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 .github/workflows/build.yml | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3235c94..b51f990 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -97,8 +97,14 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v4
 
-      - name: Apply x86 patch
-        run: patch -p1 -i src/variant-x86.patch
+      - name: Load x86 build args
+        id: variant
+        run: |
+          {
+            echo 'args<<EOF'
+            cat src/variant-x86.args
+            echo 'EOF'
+          } >> "$GITHUB_OUTPUT"
 
       - name: Generate archive name and version string
         id: filename
@@ -112,6 +118,7 @@ jobs:
         uses: docker/build-push-action@v7
         with:
           context: .
+          build-args: ${{ steps.variant.outputs.args }}
           tags: w64devkit:${{ env.ARCH }}
           load: true
           cache-from: type=gha,scope=w64devkit-${{ env.ARCH }}
@@ -175,13 +182,20 @@ jobs:
             > w64devkit-x64-${{ steps.filename.outputs.version }}.7z.exe
           ls -lh w64devkit-x64-${{ steps.filename.outputs.version }}.7z.exe
 
-      - name: Apply x86 patch
-        run: patch -p1 -i src/variant-x86.patch
+      - name: Load x86 build args
+        id: variant
+        run: |
+          {
+            echo 'args<<EOF'
+            cat src/variant-x86.args
+            echo 'EOF'
+          } >> "$GITHUB_OUTPUT"
 
       - name: Build signed image (x86)
         uses: docker/build-push-action@v7
         with:
           context: .
+          build-args: ${{ steps.variant.outputs.args }}
           target: signed
           tags: w64devkit:x86-signed
           load: true