From 3c48a65feb3c654af63d845cac9639ca3596a5f4 Mon Sep 17 00:00:00 2001
From: Saurabh Shrihar <sshrihar@polygon.technology>
Date: Wed, 25 Sep 2024 17:27:06 +0400
Subject: [PATCH] Consistent deployment update

---
 .github/workflows/build_and_deploy.yml      | 18 +++++++++++++-----
 .github/workflows/hosted-dev-deployment.yml |  3 +--
 build_branches.py                           |  5 +++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build_and_deploy.yml b/.github/workflows/build_and_deploy.yml
index 40b05931..aa2a8d11 100644
--- a/.github/workflows/build_and_deploy.yml
+++ b/.github/workflows/build_and_deploy.yml
@@ -64,24 +64,31 @@ jobs:
         run: |
           changed_files=$(git diff --name-only HEAD^ HEAD)
           num_changed_files=$(echo "$changed_files" | wc -l)
+          echo "Number of Files changed=$num_changed_files"
           echo "FILES_CHANGED=$num_changed_files" >> "$GITHUB_OUTPUT"
 
   check_pr_open:
     runs-on: ubuntu-latest
     environment: ${{ inputs.environment }}
     needs: [check_files_changed]
-    if: needs.check_files_changed.outputs.FILES_CHANGED != '' && startsWith(github.ref, 'refs/heads/hosted/')
+    if: needs.check_files_changed.outputs.FILES_CHANGED != '' && startsWith(github.head_ref, 'hosted/')
     permissions:
       id-token: write
       contents: write
     outputs:
       PR_OPEN: ${{ steps.check_pr.outputs.PR_OPEN }}
     steps:
+      - name: Checkout Code Repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1
+
       - name: Check for open PR
         id: check_pr
         run: |
-          BRANCH_NAME=$(echo "${GITHUB_REF}" | cut -d'/' -f4)
-          pr_number=$(gh pr list --head "hosted/$BRANCH_NAME" --state open --json number --jq '.[0].number')
+          BRANCH_NAME=${{ github.head_ref }}
+          pr_number=$(gh pr list --head "$BRANCH_NAME" --state open --json number --jq '.[0].number')
+          echo "Checked PR number: $pr_number"
           echo "PR_OPEN=$pr_number" >> "$GITHUB_OUTPUT"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -93,10 +100,11 @@ jobs:
     if: |
       needs.check_files_changed.outputs.FILES_CHANGED != '' && github.ref == 'refs/heads/dev' ||
       needs.check_pr_open.outputs.PR_OPEN != '' && needs.check_files_changed.outputs.FILES_CHANGED != '' && 
-      startsWith(github.ref, 'refs/heads/hosted/')
+      startsWith(github.head_ref, 'hosted/')
     permissions:
       id-token: write
       contents: write
+      pull-requests: write
     steps:
       - uses: actions/setup-python@v4
         with:
@@ -160,4 +168,4 @@ jobs:
         with:
           cf_zone: ${{ secrets.CLOUDFLARE_ZONE }}
           cf_auth: ${{ secrets.CLOUDFLARE_AUTH_KEY }}
-          hosts: ${{ inputs.core_app }}-${{ inputs.environment }}.polygon.technology
\ No newline at end of file
+          hosts: ${{ inputs.core_app }}-${{ inputs.environment }}.polygon.technology
diff --git a/.github/workflows/hosted-dev-deployment.yml b/.github/workflows/hosted-dev-deployment.yml
index 2747f946..fc21e73c 100644
--- a/.github/workflows/hosted-dev-deployment.yml
+++ b/.github/workflows/hosted-dev-deployment.yml
@@ -1,11 +1,10 @@
 name: Hosted PR and Dev Deployment
 on:
   pull_request:
-    types: [opened, edited, reopened]
+    types: [opened, edited, reopened, synchronize]
   push:
     branches:
       - dev
-      - hosted/**
   workflow_dispatch:
 
 jobs:
diff --git a/build_branches.py b/build_branches.py
index 8cd8c200..6a6ebe54 100755
--- a/build_branches.py
+++ b/build_branches.py
@@ -1,3 +1,4 @@
+
 import ast
 import os
 import shutil
@@ -148,5 +149,5 @@ def update_nginx_config(pr_numbers):
 
 if __name__ == "__main__":
     current_dir = os.getcwd()
-    pr_numbers = process_branch_folders()
-    update_nginx_config(pr_numbers)
\ No newline at end of file
+    open_prs = process_branch_folders()
+    update_nginx_config(open_prs)