Commit6f68505

committed

ci: prevent merge-requests in a PR

Have the CI prevent merge-requests being part of a PR

1 parent48726fd commit6f68505Copy full SHA for 6f68505

File tree

+11

-0

lines changed

+11

-0

lines changed

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -41,3 +41,14 @@ jobs:`
`41`	`41`	`run:tox -e isort -- --check`
`42`	`42`	`-name:Run pylint Python code static checker (https://github.com/PyCQA/pylint)`
`43`	`43`	`run:tox -e pylint`
	`44`	`+ -name:Ensure no merge-commits in the Pull Request (PR)`
	`45`	`+if:github.event_name == 'pull_request'`
	`46`	`+run:\|`
	`47`	`+ HEAD_SHA="${{ github.event.pull_request.head.sha }}"`
	`48`	`+ echo "GITHUB_BASE_REF: ${GITHUB_BASE_REF}"`
	`49`	`+ echo "HEAD_SHA: ${HEAD_SHA}"`
	`50`	`+ MERGE_COMMITS=$(git rev-list --merges origin/${GITHUB_BASE_REF}..${HEAD_SHA})`
	`51`	`+ if [[ -n "${MERGE_COMMITS}" ]]; then`
	`52`	`+ echo "ERROR: The Pull Request (PR) contains a 'merge commit': ${MERGE_COMMITS}"`
	`53`	`+ exit 1`
	`54`	`+ fi`

Comments

(0)