Merge pull request #2259 from nicolasnoble/creating-a-jenkins-branch

Creating a branch during the Jenkins build to silence a warning.
pull/2346/head
Jan Tattermusch 10 years ago
commit 7dbb4fc05d
  1. 7
      tools/jenkins/run_jenkins.sh

@ -51,11 +51,8 @@ then
# Make sure docker image has been built. Should be instantaneous if so. # Make sure docker image has been built. Should be instantaneous if so.
docker build -t $DOCKER_IMAGE_NAME tools/jenkins/grpc_jenkins_slave docker build -t $DOCKER_IMAGE_NAME tools/jenkins/grpc_jenkins_slave
if [ "$ghprbPullId" != "" ] # Create a local branch so the child Docker script won't complain
then git branch jenkins-docker
# 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
# Make sure the CID file is gone. # Make sure the CID file is gone.
rm -f docker.cid rm -f docker.cid

Loading…
Cancel
Save