Commit 58f78339 authored by Robert Lyon's avatar Robert Lyon
parents 6db3536e 260cdc03
mahara-scripts (1.32) UNRELEASED; urgency=medium
* Add 16.10 branch
-- Son Nguyen <sonn@warnock.catalyst.net.nz> Mon, 05 Sep 2016 08:50:19 +1200
mahara-scripts (1.30) unstable; urgency=medium mahara-scripts (1.30) unstable; urgency=medium
* Missing backslashes in grep command are why 15.10_STABLE wasn't being picked up from git * Missing backslashes in grep command are why 15.10_STABLE wasn't being picked up from git
......
...@@ -28,6 +28,7 @@ $GERRIT_BRANCH = getenv('GERRIT_BRANCH'); ...@@ -28,6 +28,7 @@ $GERRIT_BRANCH = getenv('GERRIT_BRANCH');
$GERRIT_CHANGE_ID = getenv('GERRIT_CHANGE_ID'); $GERRIT_CHANGE_ID = getenv('GERRIT_CHANGE_ID');
$GERRIT_PATCHSET_REVISION = getenv('GERRIT_PATCHSET_REVISION'); $GERRIT_PATCHSET_REVISION = getenv('GERRIT_PATCHSET_REVISION');
$JOB_NAME = getenv('JOB_NAME'); $JOB_NAME = getenv('JOB_NAME');
$BUILD_URL = getenv('BUILD_URL');
$HOME = getenv('HOME'); $HOME = getenv('HOME');
/** /**
...@@ -346,7 +347,8 @@ echo "\n"; ...@@ -346,7 +347,8 @@ echo "\n";
passthru_or_die( passthru_or_die(
'external/vendor/bin/phpunit htdocs/', 'external/vendor/bin/phpunit htdocs/',
"This patch caused one or more phpunit tests to fail.\n\n" "This patch caused one or more phpunit tests to fail.\n\n"
."Please see the console output on test.mahara.org for details, and fix any failing tests." . $BUILD_URL . "console\n\n"
. "Please see the console output on test.mahara.org for details, and fix any failing tests."
); );
...@@ -357,7 +359,8 @@ echo "\n"; ...@@ -357,7 +359,8 @@ echo "\n";
passthru_or_die( passthru_or_die(
'test/behat/mahara_behat.sh runheadless', 'test/behat/mahara_behat.sh runheadless',
"This patch caused one or more Behat tests to fail.\n\n" "This patch caused one or more Behat tests to fail.\n\n"
."Please see the console output on test.mahara.org for details, and fix any failing tests." . $BUILD_URL . "console\n\n"
. "Please see the console output on test.mahara.org for details, and fix any failing tests."
); );
exit(0); exit(0);
......
...@@ -126,7 +126,7 @@ system "git fetch --quiet origin"; ...@@ -126,7 +126,7 @@ system "git fetch --quiet origin";
system "bzr launchpad-login dev-mahara"; system "bzr launchpad-login dev-mahara";
! -d $BZRDIR && system "bzr init-repo $BZRDIR"; ! -d $BZRDIR && system "bzr init-repo $BZRDIR";
# @UPDATE when there is a new series # @UPDATE when there is a new series
my @branches = qw(1.10_STABLE 15.04_STABLE 15.10_STABLE 16.04_STABLE master); my @branches = qw(15.04_STABLE 15.10_STABLE 16.04_STABLE 16.10_STABLE master);
foreach my $branch (@branches) { foreach my $branch (@branches) {
if ( ! -d "$BZRDIR/$branch" ) { if ( ! -d "$BZRDIR/$branch" ) {
...@@ -161,7 +161,7 @@ foreach my $lang (@langkeys) { ...@@ -161,7 +161,7 @@ foreach my $lang (@langkeys) {
if ( $remote =~ m/^lp:mahara-lang/ ) { if ( $remote =~ m/^lp:mahara-lang/ ) {
$repotype = 'launchpad'; $repotype = 'launchpad';
# @UPDATE when there is a new series # @UPDATE when there is a new series
@branches = qw(1.10_STABLE 15.04_STABLE 15.10_STABLE 16.04_STABLE master); @branches = qw(15.04_STABLE 15.10_STABLE 16.04_STABLE 16.10_STABLE master);
} }
elsif ( $remote =~ m{^https://git\.mahara\.org|^https://gitlab\.com} ) { elsif ( $remote =~ m{^https://git\.mahara\.org|^https://gitlab\.com} ) {
$repotype = 'git'; $repotype = 'git';
...@@ -171,7 +171,7 @@ foreach my $lang (@langkeys) { ...@@ -171,7 +171,7 @@ foreach my $lang (@langkeys) {
# @UPDATE when there is a new series # @UPDATE when there is a new series
# When adding a new branch name here, make sure to preface it with # When adding a new branch name here, make sure to preface it with
# "\|", that is, a backslash, then a pipe. # "\|", that is, a backslash, then a pipe.
my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|1.10_STABLE\|15.04_STABLE\|15.10_STABLE\|16.04_STABLE\)$"'; my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|15.04_STABLE\|15.10_STABLE\|16.04_STABLE\|16.10_STABLE\)$"';
my $remotebranches = `$remotebranchcmd`; my $remotebranches = `$remotebranchcmd`;
$remotebranches =~ s/\s+/ /; $remotebranches =~ s/\s+/ /;
@branches = (); @branches = ();
......
...@@ -60,7 +60,7 @@ cd ${GITDIR} ...@@ -60,7 +60,7 @@ cd ${GITDIR}
git fetch --quiet origin git fetch --quiet origin
# @UPDATE when there is a new series # @UPDATE when there is a new series
branches="1.10_STABLE 15.04_STABLE 15.10_STABLE 16.04_STABLE master" branches="15.04_STABLE 15.10_STABLE 16.04_STABLE 16.10_STABLE master"
for branch in ${branches} ; do for branch in ${branches} ; do
branchexists=`git branch | grep "${branch}$"` branchexists=`git branch | grep "${branch}$"`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment