Commit 1e72c4c

authored

Merge v1.21 into v2.1 (#1839)

2 parents 2116ad4 + c20a691 commit 1e72c4cCopy full SHA for 1e72c4c

File tree

-2

lines changed

-2

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -24,9 +24,10 @@ jobs:`
`24`	`24`
`25`	`25`	`- name: Create pull request`
`26`	`26`	`id: create-pull-request`
`27`		`- uses: alcaeus/automatic-merge-up-action@main`
	`27`	`+ uses: alcaeus/automatic-merge-up-action@1.0.0`
`28`	`28`	`with:`
`29`	`29`	`ref: ${{ github.ref_name }}`
`30`	`30`	`branchNamePattern: 'v<major>.<minor>'`
`31`	`31`	`devBranchNamePattern: 'v<major>.x'`
	`32`	`+ ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}`
`32`	`33`	`enableAutoMerge: true`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -112,11 +112,12 @@ jobs:`
`112`	`112`
`113`	`113`	`- name: "Determine branch to merge up to"`
`114`	`114`	`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`
`116`	`116`	`with:`
`117`	`117`	`ref: ${{ github.ref_name }}`
`118`	`118`	`branchNamePattern: 'v<major>.<minor>'`
`119`	`119`	`devBranchNamePattern: 'v<major>.x'`
	`120`	`+ ignoredBranches: ${{ vars.IGNORED_MERGE_UP_BRANCHES }}`
`120`	`121`
`121`	`122`	`- name: "Manually merge up changes"`
`122`	`123`	`if: ${{ steps.get-next-branch.outputs.hasNextBranch }}`

Comments

(0)