From 2dfbee50019f8878d03fea037705e10c89274bcc Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mgarrett0402@gmail.com>
Date: Wed, 28 Feb 2024 08:22:29 -0800
Subject: [PATCH] Added exception to testing workflow for version branches and
 added watch step for GitHub checks during PR merge process in build workflow

---
 .github/workflows/azure-ipam-build.yml   | 6 ++++--
 .github/workflows/azure-ipam-testing.yml | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/azure-ipam-build.yml b/.github/workflows/azure-ipam-build.yml
index 483d7bf..fb6ad1c 100644
--- 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
index 19bc4bc..21879fb 100644
--- 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 }}