ci: use github/refs/pull/<pr-id>/merge instead of doing a rebase

When fetching refs/pull/<pr-id/merge from GitHub, there is no need to do
a manual rebase. This makes things easier, as a the scripted rebases
sometimes cause CI jobs to fail.

Signed-off-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Niels de Vos
2020-10-26 08:02:26 +01:00
committed by mergify[bot]
parent cd893ba376
commit 466ada3860
6 changed files with 8 additions and 8 deletions

View File

@ -14,7 +14,7 @@
def GIT_BRANCH = 'ci/centos'
if (params.ghprbPullId != null) {
GIT_BRANCH = "pull/${ghprbPullId}/head"
GIT_BRANCH = "pull/${ghprbPullId}/merge"
}
node {