From 68d1cb9a63c9348d47ef092d4f0e3a243e2646e2 Mon Sep 17 00:00:00 2001
From: darkicewolf50 <darkicewolf50@gmail.com>
Date: Sat, 21 Dec 2024 15:06:19 -0700
Subject: [PATCH] fix(actions ): should now upload to dockerhub automatically

---
 .dockerignore                  | 0
 .github/workflows/Actions.yaml | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..e69de29
diff --git a/.github/workflows/Actions.yaml b/.github/workflows/Actions.yaml
index 8d715a2..1f99c84 100644
--- a/.github/workflows/Actions.yaml
+++ b/.github/workflows/Actions.yaml
@@ -47,7 +47,7 @@ jobs:
   Dockerhub:
     runs-on: ubuntu-latest
     needs: ruffLint # will only run if linter is successful
-    if: github.ref == 'refs/heads/main'  # Runs only if the push/PR merge is to 'main'
+    if: ${{ github.ref == 'refs/heads/main' || github.event.pull_request.merged == true }}  # Runs if it's a push to 'main' or a merged PR to 'main'
     steps:
       - name: checkout
         uses: actions/checkout@v3