mirror of https://github.com/perkeep/perkeep.git
build: update .last_go_version and handle nnn+ format in last_go_version
Change-Id: I8631d062375d14bc83ad2d07399e7902fca8daed
This commit is contained in:
parent
1f39a91eee
commit
120736a7fa
|
@ -1 +1 @@
|
|||
6g version weekly.2011-06-16 8788
|
||||
6g version weekly.2011-06-16 8838+
|
||||
|
|
5
build.pl
5
build.pl
|
@ -176,10 +176,11 @@ sub update_go {
|
|||
my $last = do { open(my $fh, ".last_go_version") or die; local $/; <$fh> };
|
||||
$last =~ s!^[68]g version weekly.[0-9]{4}-[0-9]{2}-[0-9]{2} !!;
|
||||
chomp $last;
|
||||
if ($last !~ /^[0-9]+$/) {
|
||||
unless ($last =~ /^(\d+)\+?\s*$/) {
|
||||
print "Failed to obtain maintainer's go revision\n";
|
||||
return;
|
||||
}
|
||||
my $maintainer_version = $1;
|
||||
|
||||
print "Updating go to revision: $last\n";
|
||||
my $prev_cwd = getcwd;
|
||||
|
@ -190,7 +191,7 @@ sub update_go {
|
|||
|
||||
chdir $ENV{'GOROOT'} or die "Chdir to $ENV{'GOROOT'} failed\n";
|
||||
system("hg", "pull") and die "Hg pull failed\n";
|
||||
system("hg", "update", $last) and die "Hg update failed\n";
|
||||
system("hg", "update", $maintainer_version) and die "Hg update failed\n";
|
||||
print "Building...\n";
|
||||
chdir "$ENV{'GOROOT'}/src" or die "Chdir to $ENV{'GOROOT'}/src failed\n";
|
||||
system("./all.bash") and die "Go build failed\n";
|
||||
|
|
Loading…
Reference in New Issue