From f519505b0db43ed2adfa149d99e3859ea7a81798 Mon Sep 17 00:00:00 2001
From: Jared Trouth <jtrouth@burwood.com>
Date: Wed, 13 Mar 2024 18:10:29 -0500
Subject: [PATCH] Logic fix

---
 .github/workflows/build-and-push.yaml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml
index 363a7017..52ce4da8 100644
--- a/.github/workflows/build-and-push.yaml
+++ b/.github/workflows/build-and-push.yaml
@@ -9,15 +9,15 @@ on:
        - 'master'
     tags:
       - 'v*'
-  pull_request:
-    types:
-      - 'opened'
-      - 'synchronize'
-      - 'reopened'
-      - 'closed'
-    branches:
-      - 'develop'
-      - 'master'
+  # pull_request:
+  #   types:
+  #     - 'opened'
+  #     - 'synchronize'
+  #     - 'reopened'
+  #     - 'closed'
+  #   branches:
+  #     - 'develop'
+  #     - 'master'
 
 jobs:
   build:
@@ -36,12 +36,12 @@ jobs:
         id: deploy-info
         run: |
           # Determine environment to deploy to
-          if ${{ github.ref == 'master' || github.base_ref == 'master'}}; then
-            environment_name="int"
-            credentials_json='${{ secrets.SKYVIEWER_INT_SERVICE_ACCOUNT }}'
-          elif ${{ github.ref_type == 'tag'}}; then
+          if ${{ github.ref_type == 'tag'}}; then
             environment_name="prod"
             credentials_json='${{ secrets.PIPELINE_EPO_PROD_PROJECT }}'
+          elif ${{ contains(github.ref, 'master') || contains(github.base_ref, 'master') }}; then
+            environment_name="int"
+            credentials_json='${{ secrets.SKYVIEWER_INT_SERVICE_ACCOUNT }}'
           else
             environment_name="dev"
             credentials_json='${{ secrets.DEV_SA_KEY }}'