Merge v1.20 into v1.x (#1642)

mongodb · Sep 11, 2024 · b846aa9 · b846aa9
2 parents 1dc5b6f + 7ba3371
commit b846aa9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
@@ -28,5 +28,5 @@ jobs:
  with:
  ref: ${{ github.ref_name }}
  branchNamePattern: 'v<major>.<minor>'
- fallbackBranch: 'master'
+ devBranchNamePattern: 'v<major>.x'
  enableAutoMerge: true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -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 }}