modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-02-03 05:03:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert part of #1469

Browse Source 
After merging #1469, CI runs are failing on the merge step

11:33:39  fatal: proposed/devel-build-modulemd - not something we can merge

This seems to be caused by the change to the fetch line. It seems older versions
of git might have slightly different behavior when asked to fetch a branch name.
This commit is contained in:
Mike McLean
2019-10-18 12:13:02 -04:00
parent 9379e9ac9c
commit e90fa30841
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cico-pr.pipeline
View File

@@ -49,7 +49,7 @@ node('factory2'){
timeout(time: 10, unit: 'MINUTES') {
onmyduffynode "GIT_TRACE=1 GIT_CURL_VERBOSE=1 git clone --single-branch https://pagure.io/fm-orchestrator.git"
onmyduffynode "cd fm-orchestrator && git remote add proposed \"${env.REPO}\""
onmyduffynode "cd fm-orchestrator && GIT_TRACE=1 GIT_CURL_VERBOSE=1 git fetch proposed \"${env.BRANCH}\""
onmyduffynode "cd fm-orchestrator && GIT_TRACE=1 GIT_CURL_VERBOSE=1 git fetch proposed"
onmyduffynode "cd fm-orchestrator && git checkout origin/master"
onmyduffynode "cd fm-orchestrator && git config --global user.email ci@centos.org"
onmyduffynode "cd fm-orchestrator && git config --global user.name CentOS CI"