Skip to content

Commit b846aa9

Browse files
Merge v1.20 into v1.x (#1642)
2 parents 1dc5b6f + 7ba3371 commit b846aa9

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.github/workflows/merge-up.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ jobs:
2828
with:
2929
ref: ${{ github.ref_name }}
3030
branchNamePattern: 'v<major>.<minor>'
31-
fallbackBranch: 'master'
31+
devBranchNamePattern: 'v<major>.x'
3232
enableAutoMerge: true

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ jobs:
116116
with:
117117
ref: ${{ github.ref_name }}
118118
branchNamePattern: 'v<major>.<minor>'
119-
fallbackBranch: 'master'
119+
devBranchNamePattern: 'v<major>.x'
120120

121121
- name: "Manually merge up changes"
122122
if: ${{ steps.get-next-branch.outputs.hasNextBranch }}

0 commit comments

Comments
 (0)