lib/hudson/job_config_builder.rb in hudson-0.3.0.beta.10 vs lib/hudson/job_config_builder.rb in hudson-0.3.0.beta.11
- old
+ new
@@ -60,11 +60,11 @@
b.string "receivepack"
b.string "git-upload-pack"
b.string "uploadpack"
b.string "git-upload-pack"
b.string "url"
- b.string scm
+ b.string public_only_git_scm(scm) # FIXME remove when we have deploy keys
b.string "tagopt"
b.string
end
end
@@ -76,15 +76,23 @@
end
end
end
end
+ b.localBranch
b.mergeOptions
+ b.recursiveSubmodules false
b.doGenerateSubmoduleConfigurations false
+ b.authorOrCommitter false
b.clean false
- b.choosingStrategy "Default"
+ b.wipeOutWorkspace false
+ b.buildChooser :class => "hudson.plugins.git.util.DefaultBuildChooser"
+ b.gitTool "Default"
b.submoduleCfg :class => "list"
+ b.relativeTargetDir
+ b.excludedRegions
+ b.excludedUsers
end
end
end
# <triggers class="vector">
@@ -166,9 +174,18 @@
b.rakeFile
b.rakeLibDir
b.rakeWorkingDir
b.tasks tasks
b.silent false
+ end
+ end
+
+ # Converts git@github.com:drnic/newgem.git into git://github.com/drnic/newgem.git
+ def public_only_git_scm(scm_url)
+ if scm_url =~ /git@([\w\-_.]+):(.+)\.git/
+ "git://#{$1}/#{$2}.git"
+ else
+ scm_url
end
end
end
end
\ No newline at end of file