URL: https://github.com/SSSD/sssd/pull/874 Author: pbrezina Title: #874: ci: remove left overs from previous rebase Action: synchronized
To pull the PR as Git branch: git remote add ghsssd https://github.com/SSSD/sssd git fetch ghsssd pull/874/head:pr874 git checkout pr874
From 685a0b0c98939555a634c5c3d5e0c94af814ddab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20B=C5=99ezina?= <pbrez...@redhat.com> Date: Fri, 23 Aug 2019 11:28:13 +0200 Subject: [PATCH] ci: remove left overs from previous rebase If previous run of a PR failed to rebase, the code was left in rebase in progress and was not correctly overwritten by new changes in the patches. --- Jenkinsfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2ebfe52ece..75ae3fb8d0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -122,6 +122,18 @@ class CI { ctx.env.CHANGE_TARGET ) + // Remove left overs from previous rebase if there are any + ctx.sh String.format( + 'git -C %s rebase --abort || :', + "${ctx.env.WORKSPACE}/sssd" + ) + + // Just to be sure + ctx.sh String.format( + 'rm -fr "%s/.git/rebase-apply" || :', + "${ctx.env.WORKSPACE}/sssd" + ) + ctx.sh String.format( 'git -C %s rebase origin/%s', "${ctx.env.WORKSPACE}/sssd",
_______________________________________________ sssd-devel mailing list -- sssd-devel@lists.fedorahosted.org To unsubscribe send an email to sssd-devel-le...@lists.fedorahosted.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedorahosted.org/archives/list/sssd-devel@lists.fedorahosted.org