Merge pull request #330 from ros-infrastructure/no_shallow_when_merge

don't use shallow cloning when using merge-before-build
ros-infrastructure · Aug 18, 2016 · d6a4002 · d6a4002
2 parents 76cbdc8 + 13792df
commit d6a4002
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ros_buildfarm/templates/devel/devel_job.xml.em b/ros_buildfarm/templates/devel/devel_job.xml.em
@@ -55,8 +55,7 @@ if pull_request:
     path='catkin_workspace/src/%s' % source_repo_spec.name,
     git_ssh_credential_id=git_ssh_credential_id,
 ))@
-@[end if]@
-@[if pull_request]@
+@[else]@
 @(SNIPPET(
     'scm_git',
     url=source_repo_spec.url,

diff --git a/ros_buildfarm/templates/snippet/scm_git.xml.em b/ros_buildfarm/templates/snippet/scm_git.xml.em
@@ -24,12 +24,13 @@
         <relativeTargetDir>@ESCAPE(relative_target_dir)</relativeTargetDir>
       </hudson.plugins.git.extensions.impl.RelativeTargetDirectory>
 @[end if]@
+@[if not vars().get('merge_branch')]@
       <hudson.plugins.git.extensions.impl.CloneOption>
         <shallow>true</shallow>
         <noTags>false</noTags>
         <reference/>
       </hudson.plugins.git.extensions.impl.CloneOption>
-@[if vars().get('merge_branch')]@
+@[else]@
       <hudson.plugins.git.extensions.impl.PreBuildMerge>
         <options>
           <mergeRemote>origin</mergeRemote>