Skip to content

Commit

Permalink
Update merge-up config (#1641)
Browse files Browse the repository at this point in the history
  • Loading branch information
alcaeus authored Sep 11, 2024
1 parent f9fdbc4 commit 7ba3371
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/merge-up.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ jobs:
with:
ref: ${{ github.ref_name }}
branchNamePattern: 'v<major>.<minor>'
fallbackBranch: 'master'
devBranchNamePattern: 'v<major>.x'
enableAutoMerge: true
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ jobs:
with:
ref: ${{ github.ref_name }}
branchNamePattern: 'v<major>.<minor>'
fallbackBranch: 'master'
devBranchNamePattern: 'v<major>.x'

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

0 comments on commit 7ba3371

Please sign in to comment.