From 9ba9453a97f06075b8af787c4f0273b0145889fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?=
 <jerome.tamarelle@mongodb.com>
Date: Thu, 12 Sep 2024 10:33:03 +0200
Subject: [PATCH 1/2] Update merge-up config for new branch pattern

---
 .github/workflows/merge-up.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
index bdd4cfefa..f4706c0f6 100644
--- a/.github/workflows/merge-up.yml
+++ b/.github/workflows/merge-up.yml
@@ -3,7 +3,7 @@ name: Merge up
 on:
   push:
     branches:
-      - "[0-9]+.[0-9]+"
+      - "[0-9]+.[0-9x]+"
 
 env:
   GH_TOKEN: ${{ secrets.MERGE_UP_TOKEN }}
@@ -27,5 +27,5 @@ jobs:
         uses: alcaeus/automatic-merge-up-action@main
         with:
           ref: ${{ github.ref_name }}
-          branchNamePattern: '<major>.<minor>'
+          branchNamePattern: '<major>.x'
           enableAutoMerge: true

From 6ad0a813cc130dcaf860d83f266dff76464dc20c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Tamarelle?= <jerome@tamarelle.net>
Date: Thu, 12 Sep 2024 10:47:59 +0200
Subject: [PATCH 2/2] Update .github/workflows/merge-up.yml

Co-authored-by: Andreas Braun <git@alcaeus.org>
---
 .github/workflows/merge-up.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
index f4706c0f6..1ddbb7228 100644
--- a/.github/workflows/merge-up.yml
+++ b/.github/workflows/merge-up.yml
@@ -27,5 +27,6 @@ jobs:
         uses: alcaeus/automatic-merge-up-action@main
         with:
           ref: ${{ github.ref_name }}
-          branchNamePattern: '<major>.x'
+          branchNamePattern: '<major>.<minor>'
+          devBranchNamePattern: '<major>.x'
           enableAutoMerge: true