Merge branch 'develop' into encrypt_email

prayanshchh · Nov 15, 2024 · 12a7e58 · 12a7e58
2 parents 27916b7 + 3244b22
commit 12a7e58
Show file tree

Hide file tree

Showing 4 changed files with 975 additions and 989 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -321,7 +321,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: "Check if base branch is develop"
-        if: github.event.pull_request.base.ref != 'develop'
+        if: github.event.pull_request.base.ref != 'develop-postgres'
         run: |
-          echo "PR is not against develop branch. Please refer PR_GUIDELINES.md"
+          echo "PR is not against develop-postgres branch. Please refer PR_GUIDELINES.md"
           exit 1