From cd50fb0f5668b7cc154db3a1a1c278994a65ce6e Mon Sep 17 00:00:00 2001
From: Brett Jones <brett@privacy.com>
Date: Mon, 15 Apr 2024 14:50:39 -0500
Subject: [PATCH] flatten ci

---
 .github/workflows/docker-publish.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index 69a86a5..805eb00 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -35,13 +35,11 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        if: github.event_name == 'pull_request'
-        run: make build-all
-        env:
-          DOCKER_REGISTRY: ghcr.io/${{ github.repository }}
-          
-      - name: Build and push Docker image
-        if: github.event_name != 'pull_request'
-        run: make publish-all
+        run: |
+          if [ "${{ github.event_name }}" == "pull_request" ]; then
+            make build-all
+          else
+            make publish-all
+          fi
         env:
           DOCKER_REGISTRY: ghcr.io/${{ github.repository }}