Merge branch '2.3.x'

This commit is contained in:
Adrian Moennich 2021-07-23 15:06:57 +02:00
commit d5fdc79c01

View File

@ -4,11 +4,11 @@ on:
push:
branches:
- master
- 2.3-maintenance
- '*.x'
pull_request:
branches:
- master
- 2.3-maintenance
- '*.x'
jobs:
setup:
@ -30,7 +30,7 @@ jobs:
echo "unsupported event: $GITHUB_EVENT_NAME"
exit 1
fi
if [[ $upstream_branch != master && $upstream_branch != *-maintenance && $upstream_branch != search ]]; then
if [[ $upstream_branch != master && $upstream_branch != *.x ]]; then
echo "assuming there is no branch named ${upstream_branch} in indico; defaulting to master"
upstream_branch=master
else
@ -120,7 +120,7 @@ jobs:
echo "unsupported event: $GITHUB_EVENT_NAME"
exit 1
fi
if [[ $upstream_branch != master && $upstream_branch != *-maintenance ]]; then
if [[ $upstream_branch != master && $upstream_branch != *.x ]]; then
echo "assuming there is no branch named ${upstream_branch} in indico; defaulting to master"
upstream_branch=master
else