From c5d501025a1cf1b1a940291a257bdbb9ee23a359 Mon Sep 17 00:00:00 2001
From: Matthew Hatcher <3768988+MatthewSH@users.noreply.github.com>
Date: Thu, 21 Dec 2023 00:09:42 -0600
Subject: [PATCH] fix: docker app workflow (#3332)

* fix: docker app workflow

* fix: missing checkout

* chore: upgrade upload-artifact

* fix: feedback from H0
---
 .../workflows/docker-app-rest-passthrough.yml | 21 +++++++------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/docker-app-rest-passthrough.yml b/.github/workflows/docker-app-rest-passthrough.yml
index 31d3f0984..7914aa6ea 100644
--- a/.github/workflows/docker-app-rest-passthrough.yml
+++ b/.github/workflows/docker-app-rest-passthrough.yml
@@ -8,9 +8,7 @@ on:
       - '.github/workflows/docker-app-rest-passthrough.yml'
       - 'docker-apps/rest-passthrough/**'
   pull_request:
-    paths:
-      - '.github/workflows/docker-app-rest-passthrough.yml'
-      - 'docker-apps/rest-passthrough/**'
+  merge_group:
   schedule:
     - cron: '0 0 * * *'
 
@@ -37,6 +35,8 @@ jobs:
     outputs:
       version: ${{ steps.package-version.outputs.current-version }}
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
       - name: get-npm-version
         id: package-version
         uses: martinbeentjes/npm-get-version-action@v1.3.1
@@ -64,9 +64,7 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           push: false
-          tags:
-            - 'discordeno/app-rest-passthrough:latest'
-            - 'discordeno/app-rest-passthrough:v${{ needs.app-version.outputs.version }}'
+          tags: 'discordeno/app-rest-passthrough:latest, discordeno/app-rest-passthrough:v${{ needs.app-version.outputs.version }}'
           context: docker-apps/rest-passthrough
           target: runner
           outputs: type=docker,dest=/tmp/rest-passthrough-image.tar
@@ -80,7 +78,7 @@ jobs:
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
       - name: Upload artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: rest-passthrough-image
           path: /tmp/rest-passthrough-image.tar
@@ -164,10 +162,7 @@ jobs:
         with:
           context: docker-apps/rest-passthrough
           push: false
-          tags:
-            - 'discordeno/app-rest-passthrough:latest'
-            - 'discordeno/app-rest-passthrough:v${{ needs.app-version.outputs.version }}'
-
+          tags: 'discordeno/app-rest-passthrough:latest, discordeno/app-rest-passthrough:v${{ needs.app-version.outputs.version }}'
           # linux/s390x stuck at yarn install, remove it for now
           platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le
           target: runner
@@ -207,9 +202,7 @@ jobs:
         with:
           context: docker-apps/rest-passthrough
           push: true
-          tags:
-            - 'ghcr.io/discordeno/app-rest-passthrough:latest'
-            - 'ghcr.io/discordeno/app-rest-passthrough:v${{ needs.app-version.outputs.version }}'
+          tags: 'ghcr.io/discordeno/app-rest-passthrough:latest, ghcr.io/discordeno/app-rest-passthrough:v${{ needs.app-version.outputs.version }}'
           # linux/s390x stuck at yarn install, remove it for now
           platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8,linux/ppc64le
           target: runner