Tweak merge step

HeroCC · Oct 4, 2024 · 1cd987e · 1cd987e
1 parent 2888f71
commit 1cd987e
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/.github/workflows/docker-publish.yaml b/.github/workflows/docker-publish.yaml
@@ -98,6 +98,12 @@ jobs:
     runs-on: ubuntu-latest
     needs:
       - build
+    strategy:
+      fail-fast: false
+      matrix:
+        flavor:
+          - minrobot
+          - gui
     steps:
       - name: Prepare
         run: |
@@ -116,13 +122,13 @@ jobs:
           images: ${{ env.REGISTRY_IMAGE }}
           tags: |
             # branch event
-            type=ref,enable=true,event=branch
+            type=ref,enable=true,prefix=${{ matrix.flavor }}-,event=branch
             # tag event
-            type=ref,enable=true,event=tag
+            type=ref,enable=true,prefix=${{ matrix.flavor }}-,event=tag
             # pull request event
-            type=ref,enable=true,prefix=pr-,suffix=,event=pr
+            type=ref,enable=true,prefix=${{ matrix.flavor }}-pr-,suffix=,event=pr
             # commit sha
-            type=sha,prefix=,suffix=,format=short
+            type=sha,prefix=${{ matrix.flavor }}-,suffix=,format=short
       
       - name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -137,7 +143,7 @@ jobs:
         env:
           SOURCE_DATE_EPOCH: ${{ env.COMMIT_TIMESTAMP }}
         with:
-          platforms: ${{ matrix.arch }}
+          platforms: linux/arm64,linux/amd64
           annotations: ${{ steps.meta.outputs.annotations }}
           file: docker/Dockerfile
           target: ${{ matrix.flavor }}