From bf17689376d82afe24796e6a9e202fea384beb9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Tue, 27 Feb 2024 14:59:56 +0200
Subject: [PATCH] WIP: github: Restructure the main build in a matrix with
 Dockerfile.toolchain

---
 .github/workflows/docker.yml | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bd7a5d16..91f124ed 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -39,15 +39,9 @@ jobs:
           cat parameters.txt >> $GITHUB_OUTPUT
           cat $GITHUB_OUTPUT
 
-  docker-build:
+  docker-build-dev:
     needs: [prepare]
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { file: Dockerfile,     maintag: test,     prefix: test- }
-          - { file: Dockerfile.dev, maintag: test-dev, prefix: test-dev- }
     steps:
       - uses: actions/checkout@v4
       - name: Log in to Docker Hub
@@ -61,20 +55,27 @@ jobs:
         with:
           context: .
           push: false
-          file: ./${{matrix.file}}
+          file: ./Dockerfile.dev
           tags: |
-            mstorsjo/llvm-mingw:${{matrix.maintag}}
-            mstorsjo/llvm-mingw:${{matrix.prefix}}${{needs.prepare.outputs.TAG}}
+            mstorsjo/llvm-mingw:test-dev
+            mstorsjo/llvm-mingw:test-dev-${{needs.prepare.outputs.TAG}}
       - name: Inspect Docker images
         run: |
           docker images
 
-  docker-build-toolchain:
+  docker-build:
     needs: [prepare]
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { file: Dockerfile }
+          - { file: Dockerfile.toolchain, platforms: linux/arm64 }
     steps:
       - uses: actions/checkout@v4
       - name: Download toolchain
+        if: ${{matrix.file == 'Dockerfile.toolchain'}}
         uses: dawidd6/action-download-artifact@v3
         with:
           workflow: build.yml
@@ -86,6 +87,7 @@ jobs:
           name_is_regexp: true
           path: toolchain
       - name: Set up QEMU
+        if: ${{matrix.file == 'Dockerfile.toolchain'}}
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -99,9 +101,9 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          platforms: linux/arm64
+          platforms: ${{matrix.platforms}}
           push: false
-          file: ./Dockerfile.toolchain
+          file: ./${{matrix.file}}
           load: true
           tags: |
             mstorsjo/llvm-mingw:test