From c7cba1b07553570122cc835d39994393a3b4c344 Mon Sep 17 00:00:00 2001
From: Dimitri Huisman <diman@huisman.xyz>
Date: Tue, 1 Nov 2022 10:49:44 +0000
Subject: [PATCH 1/2] Finishing touches for fixing arm builds - Use self-hosted
 runners for arm base image - Use seperate docker image cache for arm build -
 Remove unneeded needs items.

---
 .github/workflows/build_test_deploy.yml | 64 +++++++++++++++++++++----
 1 file changed, 56 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
index 487470b1..c01f67fa 100644
--- a/.github/workflows/build_test_deploy.yml
+++ b/.github/workflows/build_test_deploy.yml
@@ -89,9 +89,10 @@ jobs:
         run: |
           echo ${{ steps.targets.outputs.matrix }}
 
-## This job buils the base image. The base image is used by all other images.
-  build-base-image:
+## This job builds the base image. The base image is used by all other images.
+  build-base-image-x64:
     name: Build base image
+    if: inputs.architecture == 'linux/amd64'
     needs:
       - targets
     runs-on: ubuntu-latest
@@ -139,14 +140,64 @@ jobs:
             *.cache-to=type=registry,ref=ghcr.io/${{ steps.string.outputs.lowercase }}/base:${{ hashFiles('core/base/Dockerfile','core/base/requirements-prod.txt') }},mode=max
             *.platform=${{ inputs.architecture }}
 
+## This job builds the base image. The base image is used by all other images.
+  build-base-image-arm:
+    name: Build base image
+    if: inputs.architecture != 'linux/amd64'
+    needs:
+      - targets
+    runs-on: self-hosted
+    permissions:
+     contents: read
+     packages: write
+    steps:
+      - uses: actions/checkout@v3
+      - name: Retrieve global variables
+        shell: bash
+        run: |
+          echo "BRANCH=${{ inputs.branch }}" >> $GITHUB_ENV
+          echo "MAILU_VERSION=${{ inputs.mailu_version }}" >> $GITHUB_ENV
+          echo "PINNED_MAILU_VERSION=${{ inputs.pinned_mailu_version }}" >> $GITHUB_ENV
+          echo "DOCKER_ORG=${{ inputs.docker_org }}" >> $GITHUB_ENV
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - uses: crazy-max/ghaction-github-runtime@v2
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Helper to convert docker org to lowercase
+        id: string
+        uses: ASzc/change-string-case-action@v2
+        with:
+          string: ${{ github.repository_owner }}
+      - name: Build all docker images
+        env:
+          DOCKER_ORG: ghcr.io/${{ steps.string.outputs.lowercase }}
+          MAILU_VERSION: ${{ env.MAILU_VERSION }}
+          PINNED_MAILU_VERSION: ${{ env.PINNED_MAILU_VERSION }}
+        uses: docker/bake-action@v2
+        with:
+          files: ${{env.HCL_FILE}}
+          targets: base
+          load: false
+          push: false
+          set: |
+            *.cache-from=type=registry,ref=ghcr.io/${{ steps.string.outputs.lowercase }}/base:${{ hashFiles('core/base/Dockerfile','core/base/requirements-prod.txt') }}-arm
+            *.cache-to=type=registry,ref=ghcr.io/${{ steps.string.outputs.lowercase }}/base:${{ hashFiles('core/base/Dockerfile','core/base/requirements-prod.txt') }}-arm,mode=max
+            *.platform=${{ inputs.architecture }}
+
 # This job builds all the images. The build cache is stored in the github actions cache.
 # In further jobs, this cache is used to quickly rebuild the images.
   build:
     name: Build images for linux/amd64
     if: inputs.architecture == 'linux/amd64'
     needs:
-      - targets
-      - build-base-image
+      - build-base-image-x64
     strategy:
       fail-fast: false
       matrix:
@@ -203,8 +254,7 @@ jobs:
     name: Build images for ARM64 & ARM/V7
     if: inputs.architecture != 'linux/amd64'
     needs:
-      - targets
-      - build-base-image
+      - build-base-image-arm
     strategy:
       fail-fast: false
       matrix:
@@ -264,7 +314,6 @@ jobs:
      contents: read
      packages: read
     needs:
-      - targets
       - build
     strategy:
       fail-fast: false
@@ -319,7 +368,6 @@ jobs:
     if: inputs.deploy == 'true'
     runs-on: ubuntu-latest
     needs:
-      - build
       - tests
     strategy:
       fail-fast: false

From 6549dbf24788e8ec949eac5bb22b57c8424ce6f4 Mon Sep 17 00:00:00 2001
From: Dimitri Huisman <diman@huisman.xyz>
Date: Tue, 1 Nov 2022 10:56:33 +0000
Subject: [PATCH 2/2] Sigh. needs.* context is only available if you include it
 in needs:

---
 .github/workflows/build_test_deploy.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
index c01f67fa..f3977e1f 100644
--- a/.github/workflows/build_test_deploy.yml
+++ b/.github/workflows/build_test_deploy.yml
@@ -197,6 +197,7 @@ jobs:
     name: Build images for linux/amd64
     if: inputs.architecture == 'linux/amd64'
     needs:
+      - targets
       - build-base-image-x64
     strategy:
       fail-fast: false
@@ -254,6 +255,7 @@ jobs:
     name: Build images for ARM64 & ARM/V7
     if: inputs.architecture != 'linux/amd64'
     needs:
+      - targets
       - build-base-image-arm
     strategy:
       fail-fast: false