Skip to content

Commit 5d2036e

Browse files
Merge v2.1 into v2.x (#1840)
2 parents db442b0 + 1e72c4c commit 5d2036e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/merge-up.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ jobs:
2424

2525
- name: Create pull request
2626
id: create-pull-request
27-
uses: alcaeus/automatic-merge-up-action@main
27+
uses: alcaeus/automatic-merge-up-action@1.0.0
2828
with:
2929
ref: ${{ github.ref_name }}
3030
branchNamePattern: 'v<major>.<minor>'
3131
devBranchNamePattern: 'v<major>.x'
32+
ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}
3233
enableAutoMerge: true

.github/workflows/release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,12 @@ jobs:
112112

113113
- name: "Determine branch to merge up to"
114114
id: get-next-branch
115-
uses: alcaeus/automatic-merge-up-action/get-next-branch@main
115+
uses: alcaeus/automatic-merge-up-action/get-next-branch@1.0.0
116116
with:
117117
ref: ${{ github.ref_name }}
118118
branchNamePattern: 'v<major>.<minor>'
119119
devBranchNamePattern: 'v<major>.x'
120+
ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}
120121

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

0 commit comments

Comments
 (0)