From 1e9726b9ee769bdda3a83ed2ad9bc2fcde5026b4 Mon Sep 17 00:00:00 2001
From: Jonny Stoten <jonny.stoten@docker.com>
Date: Tue, 10 Sep 2024 16:39:02 +0100
Subject: [PATCH 1/2] Fix regexes for autolabeler

---
 .github/release-drafter-config.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/release-drafter-config.yml b/.github/release-drafter-config.yml
index aebde706..9f255a93 100644
--- a/.github/release-drafter-config.yml
+++ b/.github/release-drafter-config.yml
@@ -47,25 +47,25 @@ autolabeler:
       - '/chore\/.+/'
       - '/refactor\/.+/'
     title:
-      - "/docs/i"
-      - "/test/i"
-      - "/chore/i"
-      - "/refactor/i"
+      - "/^docs!?:/i"
+      - "/^test!?:/i"
+      - "/^chore!?:/i"
+      - "/^refactor!?:/i"
   - label: "bug"
     branch:
       - '/fix\/.+/'
       - '/revert\/.+/'
     title:
-      - "/fix/i"
-      - "/revert/i"
+      - "/^fix!?:/i"
+      - "/^revert!?:/i"
   - label: "feature"
     branch:
       - '/feature\/.+/'
       - '/feat\/.+/'
       - '/add\/.+/'
     title:
-      - "/feat/i"
-      - "/add/i"
+      - "/^feat!?:/i"
+      - "/^add!?:/i"
   - label: "breaking"
     title:
       - "/^[a-zA-Z]+!:/i"

From a0c7bb2e87e3c1bb0654f742e57814cd8446f3ce Mon Sep 17 00:00:00 2001
From: Jonny Stoten <jonny.stoten@docker.com>
Date: Tue, 10 Sep 2024 17:44:40 +0100
Subject: [PATCH 2/2] Remove branch autolabeler rules

---
 .github/release-drafter-config.yml | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/.github/release-drafter-config.yml b/.github/release-drafter-config.yml
index 9f255a93..fe1a5c83 100644
--- a/.github/release-drafter-config.yml
+++ b/.github/release-drafter-config.yml
@@ -41,28 +41,16 @@ autolabeler:
   - label: "chore"
     files:
       - "*.md"
-    branch:
-      - '/docs{0,1}\/.+/'
-      - '/tests{0,1}\/.+/'
-      - '/chore\/.+/'
-      - '/refactor\/.+/'
     title:
       - "/^docs!?:/i"
       - "/^test!?:/i"
       - "/^chore!?:/i"
       - "/^refactor!?:/i"
   - label: "bug"
-    branch:
-      - '/fix\/.+/'
-      - '/revert\/.+/'
     title:
       - "/^fix!?:/i"
       - "/^revert!?:/i"
   - label: "feature"
-    branch:
-      - '/feature\/.+/'
-      - '/feat\/.+/'
-      - '/add\/.+/'
     title:
       - "/^feat!?:/i"
       - "/^add!?:/i"