From 68b35af353e2ed677d4f091e9c79a0a831255c50 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Tue, 27 Oct 2015 18:31:23 +0800 Subject: [PATCH] MDL-51906 testing: Hardcode branch name --- .travis.yml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 231609804d9..55566984bc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -165,29 +165,10 @@ script: # The local_ci repository does the actual checking. git clone https://github.com/moodlehq/moodle-local_ci.git local/ci - # Determine the branch based on the release maturity. - grep '^$maturity.*=.*MATURITY_STABLE.*' version.php > /dev/null - if [ $? -eq 0 ]; - then - # This is a stable branch. Use the version from version.php to determine which one. - branchname="MOODLE_`grep '^$branch' version.php | sed "s/^.*'\([0-9]*\)'.*$/\1/"`_STABLE"; - else - # We only branch at the point at which we make the release stable. - # Revert to 'master' until we do so. - branchname='master'; - fi - # We need the official upstream for comparison git remote add upstream https://github.com/moodle/moodle.git; - # Check to see if the remote branch was found. - git ls-remote --exit-code --heads upstream "$branchname" - if [ $? -ne 0 ]; - then - echo "Branch '$branchname' could not be found. Skipping further CI Tests" && false; - fi - - git fetch upstream "$branchname"; + git fetch upstream master; export GIT_PREVIOUS_COMMIT="`git merge-base FETCH_HEAD $TRAVIS_COMMIT`"; export GIT_COMMIT="$TRAVIS_COMMIT"; export UPSTREAM_FETCH_HEAD=`git rev-parse FETCH_HEAD`