From bf48d3c3be170abcbd5082c3a0e00878c0c80e19 Mon Sep 17 00:00:00 2001
From: Konrad Jamrozik <kojamroz@microsoft.com>
Date: Wed, 28 Feb 2024 22:13:14 -0800
Subject: [PATCH 1/2] Update workflow-bot comment.yml: update guidance for
 publishing to public repo; add support for new breaking changes labels

---
 .github/comment.yml | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/comment.yml b/.github/comment.yml
index 57779c57ae98..a610eba9525a 100644
--- a/.github/comment.yml
+++ b/.github/comment.yml
@@ -13,9 +13,7 @@
       If this PR is targeting `main` branch, then it cannot be merged, as `azure-rest-api-specs-pr` repo `main` branch 
       is mirrored from `azure-rest-api-specs` `main`` branch. <br/>
       If you want to publish the PR to the public repo (`Azure/azure-rest-api-specs`) `main` branch, 
-      please use [OpenAPIHub Publish PR](${openapiHub}/tools/publishpullrequest?pr=${owner}/${repo}/${PRNumber}&to=${to}).
-      </li><li>
-      For further guidance see [Spec Repos](https://eng.ms/docs/products/azure-developer-experience/design/api-specs-pr/api-repos).
+      follow the guidance given in the [spec repos article](https://eng.ms/docs/products/azure-developer-experience/design/api-specs-pr/api-repos).
       </li>
 
 - rule:
@@ -86,6 +84,20 @@
     onLabeledAddLabels:
         - WaitForARMFeedback
 
+- rule:
+    type: label
+    label: BreakingChange-Approved-*
+    booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)&&ARMReview"
+    onLabeledAddLabels:
+        - WaitForARMFeedback
+
+- rule:
+    type: label
+    label: Versioning-Approved-*
+    booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)&&ARMReview"
+    onLabeledAddLabels:
+        - WaitForARMFeedback
+
 - rule:
     type: unlabeled
     label: ARMChangesRequested

From a1d03241766d6fddb5f24a9e391d6f15ba6132d8 Mon Sep 17 00:00:00 2001
From: Konrad Jamrozik <kojamroz@microsoft.com>
Date: Wed, 28 Feb 2024 22:19:16 -0800
Subject: [PATCH 2/2] Update comment.yml

---
 .github/comment.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/comment.yml b/.github/comment.yml
index a610eba9525a..381293afc97b 100644
--- a/.github/comment.yml
+++ b/.github/comment.yml
@@ -80,21 +80,21 @@
 - rule:
     type: label
     label: Approved-BreakingChange
-    booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)&&ARMReview"
+    booleanFilterExpression: "!(ARMSignedOff||WaitForARMFeedback||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit||)&&ARMReview"
     onLabeledAddLabels:
         - WaitForARMFeedback
 
 - rule:
     type: label
     label: BreakingChange-Approved-*
-    booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)&&ARMReview"
+    booleanFilterExpression: "!(ARMSignedOff||WaitForARMFeedback||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)&&ARMReview"
     onLabeledAddLabels:
         - WaitForARMFeedback
 
 - rule:
     type: label
     label: Versioning-Approved-*
-    booleanFilterExpression: "!(ARMSignedOff||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)&&ARMReview"
+    booleanFilterExpression: "!(ARMSignedOff||WaitForARMFeedback||ARMChangesRequested||Approved-OkToMerge||WaitForARMRevisit)&&ARMReview"
     onLabeledAddLabels:
         - WaitForARMFeedback