From f64f40c37409c3c9bec3e8b7b1935932815491b9 Mon Sep 17 00:00:00 2001
From: Adrian Moennich <adrian.moennich@cern.ch>
Date: Fri, 23 Jul 2021 13:39:40 +0200
Subject: [PATCH] Switch from 2.3-maintenance to 2.3.x branch names

---
 .github/workflows/ci.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f5c976f..b76c717 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,11 +4,11 @@ on:
   push:
     branches:
       - master
-      - 2.3-maintenance
+      - '*.x'
   pull_request:
     branches:
       - master
-      - 2.3-maintenance
+      - '*.x'
 
 jobs:
   setup:
@@ -30,9 +30,9 @@ jobs:
             echo "unsupported event: $GITHUB_EVENT_NAME"
             exit 1
           fi
-          if [[ $upstream_branch != master && $upstream_branch != *-maintenance ]]; then
-            echo "assuming there is no branch named ${upstream_branch} in indico; defaulting to 2.3-maintenance"
-            upstream_branch=2.3-maintenance
+          if [[ $upstream_branch != master && $upstream_branch != *.x ]]; then
+            echo "assuming there is no branch named ${upstream_branch} in indico; defaulting to 2.3.x"
+            upstream_branch=2.3.x
           else
             echo "using indico upstream branch ${upstream_branch}"
           fi
@@ -112,9 +112,9 @@ jobs:
             echo "unsupported event: $GITHUB_EVENT_NAME"
             exit 1
           fi
-          if [[ $upstream_branch != master && $upstream_branch != *-maintenance ]]; then
-            echo "assuming there is no branch named ${upstream_branch} in indico; defaulting to 2.3-maintenance"
-            upstream_branch=2.3-maintenance
+          if [[ $upstream_branch != master && $upstream_branch != *.x ]]; then
+            echo "assuming there is no branch named ${upstream_branch} in indico; defaulting to 2.3.x"
+            upstream_branch=2.3.x
           else
             echo "using indico upstream branch ${upstream_branch}"
           fi
@@ -203,9 +203,9 @@ jobs:
             echo "unsupported event: $GITHUB_EVENT_NAME"
             exit 1
           fi
-          if [[ $upstream_branch != master && $upstream_branch != *-maintenance ]]; then
-            echo "assuming there is no branch named ${upstream_branch} in indico; defaulting to 2.3-maintenance"
-            upstream_branch=2.3-maintenance
+          if [[ $upstream_branch != master && $upstream_branch != *.x ]]; then
+            echo "assuming there is no branch named ${upstream_branch} in indico; defaulting to 2.3.x"
+            upstream_branch=2.3.x
           else
             echo "using indico upstream branch ${upstream_branch}"
           fi