From e9a7004cd6af1ef0b5433efc9d5b41041da5f4e1 Mon Sep 17 00:00:00 2001
From: Andreas Braun <andreas.braun@mongodb.com>
Date: Thu, 12 Sep 2024 10:43:31 +0200
Subject: [PATCH] Update branch names for GHA workflows

---
 .github/workflows/arginfo-files.yml     | 2 --
 .github/workflows/clang-format.yml      | 2 --
 .github/workflows/composer-validate.yml | 2 --
 .github/workflows/merge-up.yml          | 2 +-
 .github/workflows/static-analysis.yml   | 2 --
 .github/workflows/tests.yml             | 2 --
 6 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/.github/workflows/arginfo-files.yml b/.github/workflows/arginfo-files.yml
index 5835dffb6..7e60c13b7 100644
--- a/.github/workflows/arginfo-files.yml
+++ b/.github/workflows/arginfo-files.yml
@@ -4,12 +4,10 @@ on:
   pull_request:
     branches:
       - "v*.*"
-      - "master"
       - "feature/*"
   push:
     branches:
       - "v*.*"
-      - "master"
       - "feature/*"
 
 env:
diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
index 33ced1606..4d69ef84d 100644
--- a/.github/workflows/clang-format.yml
+++ b/.github/workflows/clang-format.yml
@@ -4,12 +4,10 @@ on:
   pull_request:
     branches:
       - "v*.*"
-      - "master"
       - "feature/*"
   push:
     branches:
       - "v*.*"
-      - "master"
       - "feature/*"
 
 env:
diff --git a/.github/workflows/composer-validate.yml b/.github/workflows/composer-validate.yml
index 5f75b62af..47255798f 100644
--- a/.github/workflows/composer-validate.yml
+++ b/.github/workflows/composer-validate.yml
@@ -4,12 +4,10 @@ on:
   pull_request:
     branches:
       - "v*.*"
-      - "master"
       - "feature/*"
   push:
     branches:
       - "v*.*"
-      - "master"
       - "feature/*"
 
 jobs:
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
index 03f3065bb..0ad47c1c2 100644
--- a/.github/workflows/merge-up.yml
+++ b/.github/workflows/merge-up.yml
@@ -3,7 +3,7 @@ name: Merge up
 on:
   push:
     branches:
-      - "v[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9x]+"
 
 env:
   GH_TOKEN: ${{ secrets.MERGE_UP_TOKEN }}
diff --git a/.github/workflows/static-analysis.yml b/.github/workflows/static-analysis.yml
index d77611839..53bca7dc6 100644
--- a/.github/workflows/static-analysis.yml
+++ b/.github/workflows/static-analysis.yml
@@ -5,12 +5,10 @@ on:
   pull_request:
     branches:
       - "v*.*"
-      - "master"
       - "feature/*"
   push:
     branches:
       - "v*.*"
-      - "master"
       - "feature/*"
   workflow_call:
     inputs:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index bd2c770a1..56eb5b6ea 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -4,12 +4,10 @@ on:
   pull_request:
     branches:
       - "v*.*"
-      - "master"
       - "feature/*"
   push:
     branches:
       - "v*.*"
-      - "master"
       - "feature/*"
 
 jobs: