Commit 3fb0d050 authored by Robert Lyon's avatar Robert Lyon
Browse files
parents 7c32c833 c56be902
mahara-scripts (1.35) UNRELEASED; urgency=medium
mahara-scripts (1.36) UNRELEASED; urgency=medium
* Add 18.04 branch
[ Son Nguyen ]
* Update the deb package for custom-site-mahara-langpacks
-- Cecilia Vela Gurovic <ceciliavg@ceciliavg-pc.dynamic.wgtn.cat-it.co.nz> Fri, 23 Mar 2018 15:12:40 +1300
[ Cecilia Vela Gurovic ]
* 18.10 release
-- Cecilia Vela Gurovic <ceciliavg@ceciliavg-pc.dynamic.wgtn.cat-it.co.nz> Tue, 02 Oct 2018 09:31:57 +1300
mahara-scripts (1.32) UNRELEASED; urgency=medium
......
......@@ -65,6 +65,10 @@ $BEHATNOTNEEDED = "behatnotneeded";
// The regex we use to check for whether a commit includes new Behat tests (any changes to files)
// that match this regex)
$BEHATTESTREGEX = "^test/behat/features/";
// Number of behat tests included in patch
$BEHATTESTNUMBER = 0;
// the name of the feature file if the patch includes only one test
$BEHATTESTFEATURE = '';
// If a user belongs to one of these groups in Gerrit, it means that a member of the Mahara community
// has manually checked them out and added them to the group, so we can trust they're probably not
// an attacker.
......@@ -294,8 +298,12 @@ passthru_or_die(
echo "\n";
echo "########## Verify that the patch contains a Behat test\n";
echo "\n";
if (trim(shell_exec("git diff-tree --no-commit-id --name-only -r HEAD | grep -c $BEHATTESTREGEX")) >= 1) {
if (($BEHATTESTNUMBER = trim(shell_exec("git diff-tree --no-commit-id --name-only -r HEAD | grep -c $BEHATTESTREGEX"))) >= 1) {
echo "Patch includes a Behat test.\n";
if ($BEHATTESTNUMBER === '1') {
$BEHATTESTFEATURE = basename(trim(shell_exec("git diff-tree --no-commit-id --name-only -r HEAD | grep $BEHATTESTREGEX")));
}
}
else {
# Check whether the commit message has "behatnotneeded" in it.
......@@ -368,8 +376,9 @@ echo "\n";
echo "########## Run Behat tests\n";
echo "\n";
passthru_or_die(
"MULTI_JOB_NAME=${MULTI_JOB_NAME} PHP_PORT=${PHP_PORT} SELENIUM_PORT=${SELENIUM_PORT} test/behat/mahara_behat.sh runheadless",
"MULTI_JOB_NAME=${MULTI_JOB_NAME} PHP_PORT=${PHP_PORT} SELENIUM_PORT=${SELENIUM_PORT} test/behat/mahara_behat.sh runheadless ${BEHATTESTFEATURE}",
"This patch caused one or more Behat tests to fail.\n\n"
. $BUILD_URL . "console\n\n"
. "Please see the console output on test.mahara.org for details, and fix any failing tests."
......
......@@ -126,7 +126,7 @@ system "git fetch --quiet origin";
system "bzr launchpad-login dev-mahara";
! -d $BZRDIR && system "bzr init-repo $BZRDIR";
# @UPDATE when there is a new series
my @branches = qw(16.10_STABLE 17.04_STABLE 17.10_STABLE 18.04_STABLE master);
my @branches = qw(17.04_STABLE 17.10_STABLE 18.04_STABLE 18.10_STABLE master);
foreach my $branch (@branches) {
if ( ! -d "$BZRDIR/$branch" ) {
......@@ -161,7 +161,7 @@ foreach my $lang (@langkeys) {
if ( $remote =~ m/^lp:mahara-lang/ ) {
$repotype = 'launchpad';
# @UPDATE when there is a new series
@branches = qw(16.10_STABLE 17.04_STABLE 17.10_STABLE 18.04_STABLE master);
@branches = qw(17.04_STABLE 17.10_STABLE 18.04_STABLE 18.10_STABLE master);
}
elsif ( $remote =~ m{^https://git\.mahara\.org|^https://gitlab\.com} ) {
$repotype = 'git';
......@@ -171,7 +171,7 @@ foreach my $lang (@langkeys) {
# @UPDATE when there is a new series
# When adding a new branch name here, make sure to preface it with
# "\|", that is, a backslash, then a pipe.
my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|16.10_STABLE\|17.04_STABLE\|17.10_STABLE\|18.04_STABLE\)$"';
my $remotebranchcmd = 'git branch -r | grep -v "HEAD" | grep "origin\/\(master\|17.04_STABLE\|17.10_STABLE\|18.04_STABLE\|18.10_STABLE\)$"';
my $remotebranches = `$remotebranchcmd`;
$remotebranches =~ s/\s+/ /;
@branches = ();
......
......@@ -60,7 +60,7 @@ cd ${GITDIR}
git fetch --quiet origin
# @UPDATE when there is a new series
branches="16.10_STABLE 17.04_STABLE 17.10_STABLE 18.04_STABLE master"
branches="17.04_STABLE 17.10_STABLE 18.04_STABLE 18.10_STABLE master"
for branch in ${branches} ; do
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