* Disable gzip compression in build-remote.pl because it puts too much
load on the Hydra build farm (where it's unnecessary anyway because it has a fast connection to the build machines). In any case, compression can be enabled by using the `-C' option to ssh.
This commit is contained in:
		
							parent
							
								
									5388944e8d
								
							
						
					
					
						commit
						50e34891f0
					
				
					 1 changed files with 2 additions and 2 deletions
				
			
		| 
						 | 
					@ -222,7 +222,7 @@ print "copying inputs...\n";
 | 
				
			||||||
my $maybeSign = "";
 | 
					my $maybeSign = "";
 | 
				
			||||||
$maybeSign = "--sign" if -e "/nix/etc/nix/signing-key.sec";
 | 
					$maybeSign = "--sign" if -e "/nix/etc/nix/signing-key.sec";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
system("NIX_SSHOPTS=\"$sshOpts\" @bindir@/nix-copy-closure --gzip $hostName $maybeSign $drvPath $inputs") == 0
 | 
					system("NIX_SSHOPTS=\"$sshOpts\" @bindir@/nix-copy-closure $hostName $maybeSign $drvPath $inputs") == 0
 | 
				
			||||||
    or die "cannot copy inputs to $hostName: $?";
 | 
					    or die "cannot copy inputs to $hostName: $?";
 | 
				
			||||||
 | 
					
 | 
				
			||||||
print "building...\n";
 | 
					print "building...\n";
 | 
				
			||||||
| 
						 | 
					@ -251,6 +251,6 @@ foreach my $output (split '\n', $outputs) {
 | 
				
			||||||
    my $maybeSignRemote = "";
 | 
					    my $maybeSignRemote = "";
 | 
				
			||||||
    $maybeSignRemote = "--sign" if $UID != 0;
 | 
					    $maybeSignRemote = "--sign" if $UID != 0;
 | 
				
			||||||
    
 | 
					    
 | 
				
			||||||
    system("ssh $sshOpts $hostName 'nix-store --export $maybeSignRemote $output | gzip' | gunzip | @bindir@/nix-store --import > /dev/null") == 0
 | 
					    system("ssh $sshOpts $hostName 'nix-store --export $maybeSignRemote $output' | @bindir@/nix-store --import > /dev/null") == 0
 | 
				
			||||||
	or die "cannot copy $output from $hostName: $?";
 | 
						or die "cannot copy $output from $hostName: $?";
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue