diff options
| author |  Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2015-06-30 20:32:51 +0200 |
|---|---|---|
| committer |  Nicolas Noble <nicolas@nobis-crew.org> | 2015-06-30 15:24:54 -0700 |
| commit | 862c8976e19b2e1db107759b4f6cf07b5b2f06e5 (patch) | |
| tree | ef3d04542c6ada72a613c08a2ec5be9f1fa33db0 /tools | |
| parent | 9d8830da38f83fb2a9260e30fdd3b6e5785d42b3 (diff) | |
Creating a branch during the Jenkins build to silence a warning.
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/jenkins/run_jenkins.sh | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tools/jenkins/run_jenkins.sh b/tools/jenkins/run_jenkins.sh index f2091e2423..3ac2e5441e 100755 --- a/tools/jenkins/run_jenkins.sh +++ b/tools/jenkins/run_jenkins.sh @@ -51,11 +51,8 @@ then # Make sure docker image has been built. Should be instantaneous if so. docker build -t $DOCKER_IMAGE_NAME tools/jenkins/grpc_jenkins_slave - if [ "$ghprbPullId" != "" ] - then - # if we are building a pull request, grab corresponding refs. - FETCH_PULL_REQUEST_CMD="&& git fetch $GIT_URL refs/pull/$ghprbPullId/merge refs/pull/$ghprbPullId/head" - fi + # Create a local branch so the child Docker script won't complain + git branch jenkins-docker # Make sure the CID file is gone. rm -f docker.cid |