From 47a8703b67b3fb31f0703ea1a15a7f97e4d5f922 Mon Sep 17 00:00:00 2001
From: septs <github@septs.pw>
Date: Sat, 22 Jun 2024 13:43:10 +0800
Subject: [PATCH] chore: simplify image list maker

---
 .github/workflows/build-docker.yaml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml
index 73498bd..fde28c8 100644
--- a/.github/workflows/build-docker.yaml
+++ b/.github/workflows/build-docker.yaml
@@ -43,6 +43,8 @@ jobs:
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GitHub Container Registry
+        id: ghcr
+        continue-on-error: true
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -55,20 +57,13 @@ jobs:
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      - name: Make image list
-        id: images
-        run: |
-          echo 'images<<EOF' >> "$GITHUB_OUTPUT"
-          echo 'ghcr.io/${{ github.repository }}' >> "$GITHUB_OUTPUT"
-          if ${{ steps.dockerhub.outcome == 'success' }}; then
-            echo 'docker.io/${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }}' >> "$GITHUB_OUTPUT"
-          fi
-          echo 'EOF' >> "$GITHUB_OUTPUT"
       - name: Metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ steps.images.outputs.images }}
+          images: |
+            ghcr.io/${{ github.repository }},enable=${{ steps.ghcr.outcome == 'success' }}
+            docker.io/${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }},enable=${{ steps.dockerhub.outcome == 'success' }}
           tags: |
             type=raw,value=latest,enable={{is_default_branch}}
             type=semver,pattern={{version}}