Skip to content

Commit 3a631de

Browse files
Merge pull request #2064 from mongodb/merge-release/2.2-into-master-1748446276522
Merge release/2.2 into master
2 parents d2a8537 + 7272677 commit 3a631de

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/merge-up.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ jobs:
2727

2828
- name: Create pull request
2929
id: create-pull-request
30-
uses: alcaeus/automatic-merge-up-action@main
30+
uses: alcaeus/automatic-merge-up-action@1.0.0
3131
with:
3232
ref: ${{ github.ref_name }}
3333
branchNamePattern: 'release/<major>.<minor>'
3434
devBranchNamePattern: 'v<major>'
3535
fallbackBranch: 'master'
36+
ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}
3637
enableAutoMerge: true

.github/workflows/release.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ jobs:
4949
with:
5050
version: ${{ inputs.version }}
5151
push_changes: ${{ inputs.push_changes }}
52+
ignored_branches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}
5253

5354
static-scan:
5455
needs: [pre-publish]

0 commit comments

Comments
 (0)