Skip to content

Commit b870358

Browse files
author
Christian Melchior
committed
Merge branch 'releases'
# Conflicts: # Jenkinsfile
2 parents e6b3136 + 9d435f6 commit b870358

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/auto-merge-branches.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
branches:
1212
# List of "from" branches. Targets are defined by the `find-target-branch`-step below.
1313
- releases
14-
- master
14+
- main
1515

1616
jobs:
1717
main:
@@ -27,7 +27,7 @@ jobs:
2727
id: find-target-branch
2828
shell: sh
2929
run: |
30-
if [ "${GITHUB_REF#refs/heads/}" = "master" ]; then echo '::set-output name=branch::releases/ktor2-support'; fi
30+
if [ "${GITHUB_REF#refs/heads/}" = "main" ]; then echo '::set-output name=branch::releases/ktor2-support'; fi
3131
if [ "${GITHUB_REF#refs/heads/}" = "releases" ]; then echo '::set-output name=branch::${{ github.event.repository.default_branch }}'; fi
3232
3333
# Unconditionally create a PR with the changes that needs to be manually reviewed.

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import groovy.json.JsonOutput
1919
@Library('realm-ci') _
2020

2121
// Branches from which we release SNAPSHOT's. Only release branches need to run on actual hardware.
22-
releaseBranches = [ 'master', 'releases', 'next-major' ]
22+
releaseBranches = [ 'main', 'releases', 'next-major' ]
2323
// Branches that are "important", so if they do not compile they will generate a Slack notification
24-
slackNotificationBranches = [ 'master', 'releases', 'next-major' ]
24+
slackNotificationBranches = [ 'main', 'releases', 'next-major' ]
2525
// Shortcut to current branch name that is being tested
2626
currentBranch = (env.CHANGE_BRANCH == null) ? env.BRANCH_NAME : env.CHANGE_BRANCH
2727

0 commit comments

Comments
 (0)