From 3a253aa03689cb517293e447bd006853e741fd59 Mon Sep 17 00:00:00 2001
From: Ashley Jeffs <ash@jeffail.uk>
Date: Fri, 6 Sep 2024 11:25:43 +0100
Subject: [PATCH] Fix docker images matrix

For buildx to work we need the combined arch linux/amd64,linux/arm64 in
order to create a combined image.

I've removed the matrix variables as we basically just have an explicit
include list for everything anyway.
---
 .github/workflows/release.yml | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 561cefad7..3e1287973 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -44,27 +44,26 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        flavor: [default, cgo, cloud, ai]
-        platform: ["linux/amd64", "linux/arm64"]
-        exclude:
-        - flavor: cgo
-          platform: linux/arm64
         include:
           - flavor: default
             latest: auto
             suffix: ""
+            platform: linux/amd64,linux/arm64
             file: ./resources/docker/Dockerfile
           - flavor: cgo
             latest: false
             suffix: -cgo
+            platform: linux/amd64
             file: ./resources/docker/Dockerfile.cgo
           - flavor: cloud
             latest: false
             suffix: -cloud
+            platform: linux/amd64,linux/arm64
             file: ./resources/docker/Dockerfile.cloud
           - flavor: ai
             latest: false
             suffix: -ai
+            platform: linux/amd64,linux/arm64
             file: ./resources/docker/Dockerfile.ai
     permissions:
       id-token: write