raito/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Hydra/26: Go back to using "svn export" as default for svn, added svn-checkout type for jobset which need .svn dirs. export is much more efficient

Browse source
This commit is contained in:
Rob Vermaas 2010-05-11 11:37:30 +00:00
parent 001113f7f9
commit 56f05f2bdf
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/lib/Hydra/Controller/Jobset.pm
View file

@ -172,7 +172,7 @@ sub checkInput {
my $inputType = trim $c->request->params->{"input-$baseName-type"}; my $inputType = trim $c->request->params->{"input-$baseName-type"};
error($c, "Invalid input type: $inputType") unless error($c, "Invalid input type: $inputType") unless
$inputType eq "svn" || $inputType eq "cvs" || $inputType eq "tarball" || $inputType eq "svn" || $inputType eq "svn-checkout" || $inputType eq "cvs" || $inputType eq "tarball" ||
$inputType eq "string" || $inputType eq "path" || $inputType eq "boolean" || $inputType eq "string" || $inputType eq "path" || $inputType eq "boolean" ||
$inputType eq "git" || $inputType eq "build" || $inputType eq "sysbuild" ; $inputType eq "git" || $inputType eq "build" || $inputType eq "sysbuild" ;

12
src/lib/Hydra/Helper/AddBuilds.pm
View file

@ -128,7 +128,7 @@ sub fetchInputPath {
sub fetchInputSVN { sub fetchInputSVN {
my ($db, $project, $jobset, $name, $type, $value) = @_; my ($db, $project, $jobset, $name, $type, $value, $checkout) = @_;
my $uri = $value; my $uri = $value;
@ -156,6 +156,8 @@ sub fetchInputSVN {
print STDERR "checking out Subversion input ", $name, " from $uri revision $revision\n"; print STDERR "checking out Subversion input ", $name, " from $uri revision $revision\n";
$ENV{"NIX_HASH_ALGO"} = "sha256"; $ENV{"NIX_HASH_ALGO"} = "sha256";
$ENV{"PRINT_PATH"} = "1"; $ENV{"PRINT_PATH"} = "1";
$ENV{"NIX_PREFETCH_SVN_LEAVE_DOT_SVN"} = "$checkout";
(my $res, $stdout, $stderr) = captureStdoutStderr( (my $res, $stdout, $stderr) = captureStdoutStderr(
"nix-prefetch-svn", $uri, $revision); "nix-prefetch-svn", $uri, $revision);
die "Cannot check out Subversion repository `$uri':\n$stderr" unless $res; die "Cannot check out Subversion repository `$uri':\n$stderr" unless $res;
@ -308,7 +310,6 @@ sub fetchInputGit {
# script. Thus, we leave `.git' in there. Same for # script. Thus, we leave `.git' in there. Same for
# Subversion (e.g., libgcrypt's build system uses that.) # Subversion (e.g., libgcrypt's build system uses that.)
$ENV{"NIX_PREFETCH_GIT_LEAVE_DOT_GIT"} = "1"; $ENV{"NIX_PREFETCH_GIT_LEAVE_DOT_GIT"} = "1";
$ENV{"NIX_PREFETCH_SVN_LEAVE_DOT_SVN"} = "1";
# Ask for a "deep clone" to allow "git describe" and similar # Ask for a "deep clone" to allow "git describe" and similar
# tools to work. See # tools to work. See
@ -366,7 +367,10 @@ sub fetchInput {
return fetchInputPath($db, $project, $jobset, $name, $type, $value); return fetchInputPath($db, $project, $jobset, $name, $type, $value);
} }
elsif ($type eq "svn") { elsif ($type eq "svn") {
return fetchInputSVN($db, $project, $jobset, $name, $type, $value); return fetchInputSVN($db, $project, $jobset, $name, $type, $value, 0);
}
elsif ($type eq "svn-checkout") {
return fetchInputSVN($db, $project, $jobset, $name, $type, $value, 1);
} }
elsif ($type eq "build") { elsif ($type eq "build") {
return fetchInputBuild($db, $project, $jobset, $name, $type, $value); return fetchInputBuild($db, $project, $jobset, $name, $type, $value);
@ -407,7 +411,7 @@ sub inputsToArgs {
when ("boolean") { when ("boolean") {
push @res, "--arg", $input, $alt->{value}; push @res, "--arg", $input, $alt->{value};
} }
when (["svn", "path", "build", "git", "cvs", "sysbuild"]) { when (["svn", "svn-checkout", "path", "build", "git", "cvs", "sysbuild"]) {
push @res, "--arg", $input, ( push @res, "--arg", $input, (
"{ outPath = builtins.storePath " . $alt->{storePath} . "" . "{ outPath = builtins.storePath " . $alt->{storePath} . "" .
(defined $alt->{revision} ? "; rev = \"" . $alt->{revision} . "\"" : "") . (defined $alt->{revision} ? "; rev = \"" . $alt->{revision} . "\"" : "") .

3
src/root/common.tt
View file

@ -4,7 +4,8 @@
[% inputTypes = [% inputTypes =
{ "svn" = "Subversion checkout" { "svn" = "Subversion export"
, "svn-checkout" = "Subversion checkout"
, "git" = "Git checkout" , "git" = "Git checkout"
, "tarball" = "Download of a tarball" , "tarball" = "Download of a tarball"
, "string" = "String value" , "string" = "String value"