This repository has been archived by the owner on Jul 3, 2024. It is now read-only.

Merge 2020.3 -> 2021.1 #26

	name: Merge and PR into 2021.1
	run-name: Merge 2020.3 -> 2021.1
	on:
	pull_request_target:
	types:
	- closed
	branches:
	- 'mps/2020.3'

	jobs:
	merge-and-PR-into-2021-1:
	# only trigger if it was actually merged
	if: github.event.pull_request.merged == true

	runs-on: ubuntu-latest
	steps:

	# checkout the target branch
	- name: Checkout mps/2021.1
	uses: actions/checkout@v3
	with:
	ref: 'mps/2021.1'
	fetch-depth: 0

	# actually merge from the previous branch
	- name: Perform merge from 2020.3 to 2021.1
	run: \|
	# setup to allow to merge and commit
	git config user.name 'github-actions[bot]'
	git config user.email 'github-actions[bot]@users.noreply.github.com'

	# actual merge operation
	git merge --no-ff --message "Merge 2020.3 -> 2021.1" origin/mps/2020.3 -- \|\| ( echo "Merge failed. Please merge manually!" ; exit 1 )

	# create a PR based on the merge
	- name: Create PR for MPS 2021.1
	uses: peter-evans/create-pull-request@v5
	with:
	token: ${{ secrets.MPS_REPO_PAT }}
	branch: 'merge/2021.1'
	commit-message: Merge mps/2020.3 into mps/2021.1
	title: ${{ github.event.pull_request.title }} (2020.3 -> 2021.1)
	body: \|
	This is an automatic PR which merges changes from `mps/2020.3` to `mps/2021.1`.

	[Link to previous PR for `mps/2020.3`](${{ github.event.pull_request._links.html.href }})

Provide feedback