From e6d92dc22b40956f1f7e1ca4e4d5efc25b2e35af Mon Sep 17 00:00:00 2001
From: Benjamin <31835324+Fuma419@users.noreply.github.com>
Date: Mon, 22 Apr 2024 16:53:04 -0400
Subject: [PATCH] Revert "docker push should not try to target the fork account
 only during a merge"

This reverts commit 11cd4817b4133374b2f43e83203f12eaee69b34e.
---
 .github/workflows/premerge.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/premerge.yml b/.github/workflows/premerge.yml
index 0c8daf8ce..287749711 100644
--- a/.github/workflows/premerge.yml
+++ b/.github/workflows/premerge.yml
@@ -78,11 +78,7 @@ jobs:
         echo "PREMERGE_IMAGE_ID1=${PREMERGE_IMAGE_ID1}" >> $GITHUB_ENV
     - name: Push pre-merge-${{ matrix.distro }}:guild-deploy-l_${{ env.COMMIT_SHA }}
       run: |
-        if [ "$IS_FORK" = "true" ]; then
-          docker push ${{ env.REGISTRY }}/${{ REPO_OWNER }}/pre-merge-${{ matrix.distro }}:guild-deploy-l_${{ env.COMMIT_SHA }}
-        else
-          docker push ${{ env.REGISTRY }}/${{ env.G_ACCOUNT }}/pre-merge-${{ matrix.distro }}:guild-deploy-l_${{ env.COMMIT_SHA }}
-        fi
+        docker push ${{ env.REGISTRY }}/${{ env.G_ACCOUNT }}/pre-merge-${{ matrix.distro }}:guild-deploy-l_${{ env.COMMIT_SHA }}
     - name: Testing cabal-build-all.sh (IO fork of libsodium)
       run: |
         echo "Working from PR Branch ${{ env.G_ACCOUNT }}/guild-operators/${{ env.BRANCH }} on COMMIT_SHA ${{ env.COMMIT_SHA }}"
@@ -102,11 +98,7 @@ jobs:
         echo "PREMERGE_IMAGE_ID2=${PREMERGE_IMAGE_ID2}" >> $GITHUB_ENV
     - name: Push pre-merge-${{ matrix.distro }}:cabal-l_${{ env.COMMIT_SHA }}
       run: |
-        if [ "$IS_FORK" = "true" ]; then
-          docker push ${{ env.REGISTRY }}/${{ REPO_OWNER }}/pre-merge-${{ matrix.distro }}:cabal-l_${{ env.COMMIT_SHA }}
-        else
-          docker push ${{ env.REGISTRY }}/${{ env.G_ACCOUNT }}/pre-merge-${{ matrix.distro }}:cabal-l_${{ env.COMMIT_SHA }}
-        fi     
+        docker push ${{ env.REGISTRY }}/${{ env.G_ACCOUNT }}/pre-merge-${{ matrix.distro }}:cabal-l_${{ env.COMMIT_SHA }}
     - name: Add summary details
       if: always()
       run: |