From d8bca3aef914e5ecd990c30ac627ce541b88ccbc Mon Sep 17 00:00:00 2001
From: Rouven Himmelstein <rouven@himmelstein.info>
Date: Thu, 18 Aug 2022 09:58:29 +0200
Subject: [PATCH] feat: use build matrix

---
 .github/workflows/build-image.yaml | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml
index 926630c..710d4f4 100644
--- a/.github/workflows/build-image.yaml
+++ b/.github/workflows/build-image.yaml
@@ -135,6 +135,10 @@ jobs:
     name: Build container image
     needs: [ check-oci-config, check-repo, check-code-style, check-code, test ]
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        container-image-arch: [ amd64, arm64, arm ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -147,7 +151,7 @@ jobs:
         with:
           image: ${{ env.IMAGE_NAME }}
           tags: ${{ env.TAG }}
-          archs: amd64,arm64,arm
+          archs: ${{ matrix.container-image-arch }}
           containerfiles: |
             ./Containerfile
           oci: true
@@ -158,7 +162,7 @@ jobs:
       - name: Upload container image
         uses: actions/upload-artifact@v3
         with:
-          name: image
+          name: ${{ matrix.container-image-arch }}
           path: image.tar
 
   scan-container-image:
@@ -168,7 +172,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container-image-arch: [ linux/amd64, linux/arm64, linux/arm/v7 ]
+        container-image-arch: [ amd64, arm64, arm ]
     steps:
       - name: Download Container Image
         uses: actions/download-artifact@v3
@@ -195,7 +199,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container-image-arch: [ linux/amd64, linux/arm64, linux/arm/v7 ]
+        container-image-arch: [ amd64, arm64, arm ]
     steps:
       - name: Download Container Image
         uses: actions/download-artifact@v3
@@ -228,7 +232,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        container-image-arch: [ linux/amd64, linux/arm64, linux/arm/v7 ]
+        container-image-arch: [ amd64, arm64, arm ]
     steps:
       - name: Checkout code
         uses: actions/checkout@v3