Merge pull request #240 from Azure/build-workflow-fix8

Testing Exemption and PR Merge Wait
Azure · Feb 28, 2024 · 48f7a9e · 48f7a9e
2 parents 8d42640 + 2dfbee5
commit 48f7a9e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/azure-ipam-build.yml b/.github/workflows/azure-ipam-build.yml
@@ -4,7 +4,8 @@ run-name: Azure IPAM Production Container Build
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - main
 
 permissions:
   id-token: write
@@ -127,7 +128,8 @@ jobs:
           prNumber: ${{ needs.version.outputs.prNumber }}
         run: |
           gh pr create --base main --head "ipam-version-${prNumber}" --title "Update Azure IPAM Version" --body "-Updated Version to v${{ needs.version.outputs.ipamVersion }}"
-          gh pr merge "ipam-version-${prNumber}" -t "Merge pull request from Azure/ipam-version-${prNumber} [skip ci]" -m
+          gh pr checks "ipam-version-${prNumber}" --watch
+          gh pr merge "ipam-version-${prNumber}" -t "Merge pull request from Azure/ipam-version-${prNumber} [skip ci]" -m -d
 
       - name: Pull Merged Code from Main Branch
         id: pullMainCode

diff --git a/.github/workflows/azure-ipam-testing.yml b/.github/workflows/azure-ipam-testing.yml
@@ -4,7 +4,9 @@ run-name: Azure IPAM Deployment & Testing
 
 on:
   pull_request:
-    branches: [ main ]
+    branches:
+      - main
+      - '!ipam-version-*'
 
 env:
   ACR_NAME: ${{ vars.IPAM_TEST_ACR }}