Merge pull request #469 from containers/sboeuf/fix_coveralls

.ci: Fix coveralls reports
containers · Nov 7, 2017 · e6ebf85 · e6ebf85
2 parents 9b7af20 + 7f4a3fb
commit e6ebf85
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.ci/jenkins_job_build.sh b/.ci/jenkins_job_build.sh
@@ -36,9 +36,9 @@ go get ${vc_repo} || true
 cd "${GOPATH}/src/${vc_repo}"
 if [ "${ghprbPullId}" ] && [ "${ghprbTargetBranch}" ]
 then
-	git fetch origin "pull/${ghprbPullId}/head" && git checkout FETCH_HEAD && git rebase "origin/${ghprbTargetBranch}"
+	git fetch origin "pull/${ghprbPullId}/head" && git checkout master && git reset --hard FETCH_HEAD && git rebase "origin/${ghprbTargetBranch}"
 else
-	git fetch origin && git checkout origin/master
+	git fetch origin && git checkout master && git reset --hard origin/master
 fi
 
 # Setup environment and run the tests