Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Add pseudo-branch targets HEAD_PLUS_LATEST and HEAD_PLUS_LATEST2.

  • Loading branch information...
commit ad3e6f62504fe2d5870b42d86231b0711f3e4712 1 parent 2b84b0e
@adunstan adunstan authored
Showing with 12 additions and 3 deletions.
  1. +4 −1 build-farm.conf
  2. +8 −2 run_branches.pl
View
5 build-farm.conf
@@ -190,7 +190,10 @@ my $branch;
if ($branch eq 'global')
{
- # $conf{branches_to_build} = 'ALL'; # or [qw( HEAD RELx_y_STABLE etc )]
+ $conf{branches_to_build} = 'ALL';
+ # or 'HEAD_PLUS_LATEST' or 'HEAD_PLUS_LATEST2'
+ # or [qw( HEAD RELx_y_STABLE etc )]
+
}
# MSVC setup
View
10 run_branches.pl
@@ -55,7 +55,8 @@
ref $PGBuild::conf{branches_to_build} eq 'ARRAY'
&&@{$PGBuild::conf{branches_to_build}}
)
- ||$PGBuild::conf{branches_to_build} eq 'ALL'
+ ||$PGBuild::conf{branches_to_build} =~
+ /^(ALL|HEAD_PLUS_LATEST|HEAD_PLUS_LATEST2)$/;
)
{
die "no branches_to_build specified in $buildconf";
@@ -66,7 +67,8 @@
{
@branches = @{$PGBuild::conf{branches_to_build}};
}
-elsif ($PGBuild::conf{branches_to_build} eq 'ALL' )
+elsif ($PGBuild::conf{branches_to_build} =~
+ /^(ALL|HEAD_PLUS_LATEST|HEAD_PLUS_LATEST2)$/ )
{
# Need to set the path here so we make sure we pick up the right perl.
@@ -84,6 +86,10 @@
push(@branches,$_)foreach (split(/\s+/,$branches_of_interest));
@branches = grep {$_ ne 'REL8_2_STABLE'} @branches
if $PGBuild::conf{using_msvc};
+ splice(@branches,0,-2)
+ if $PGBuild::conf{branches_to_build} eq 'HEAD_PLUS_LATEST';
+ splice(@branches,0,-3)
+ if $PGBuild::conf{branches_to_build} eq 'HEAD_PLUS_LATEST2';
}
@branches = apply_throttle(@branches);
Please sign in to comment.
Something went wrong with that request. Please try again.