fix: prod deploy condition

rudderlabs · Sep 26, 2023 · 0ee46a6 · 0ee46a6
1 parent 6e04ba2
commit 0ee46a6
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/build-and-push-docker-image.yml b/.github/workflows/build-and-push-docker-image.yml
@@ -24,7 +24,6 @@ jobs:
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Build and Push Images
-        if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true)
         uses: docker/build-push-action@v5
         with:
           context: .

diff --git a/.github/workflows/prod-deploy.yml b/.github/workflows/prod-deploy.yml
@@ -13,6 +13,7 @@ permissions: read-all
 jobs:
   build:
     name: Deploy Shopify Tracker Image on production
+    if: ((startsWith(github.event.pull_request.head.ref, 'release/') || startsWith(github.event.pull_request.head.ref, 'hotfix-release/')) && github.event.pull_request.merged == true)
     runs-on: ubuntu-latest
 
     steps:
@@ -34,8 +35,6 @@ jobs:
           echo "::set-output name=version::$VERSION"
 
       - name: Build Shopify Tracker Docker Image
-        # Only merged pull requests must trigger
-        if: github.event.pull_request.merged == true
         uses: ./.github/workflows/build-and-push-docker-image.yml
         with:
           img_tag: rudder-shopify-tracker:${{steps.get-version.outputs.version}}