From 8d5cea550cc4039cc365c269dc83cbbb9e8d6132 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Fri, 23 Nov 2012 16:31:47 +0100 Subject: [PATCH] TRAVIS_BRANCH doesn't seem to be set in before_script, hardcoding --- .travis.yml | 2 +- tests/travis/before_script | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9ea403e9..6bba86bf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: env: TESTDB=PGSQL before_script: - - ./tests/travis/before_script ~/builds/ss $TRAVIS_BRANCH + - ./tests/travis/before_script ~/builds/ss - cd ~/builds/ss script: diff --git a/tests/travis/before_script b/tests/travis/before_script index c3a62088..9e932291 100755 --- a/tests/travis/before_script +++ b/tests/travis/before_script @@ -17,8 +17,8 @@ git clone --depth=100 --quiet git://github.com/silverstripe-labs/silverstripe-sq echo "Checking out postgresql@master" git clone --depth=100 --quiet git://github.com/silverstripe/silverstripe-postgresql.git $BUILD_DIR/postgresql -echo "Checking out sapphire@$TRAVIS_BRANCH" -git clone --depth=100 --quiet -b $TRAVIS_BRANCH git://github.com/silverstripe/sapphire.git $BUILD_DIR/framework +echo "Checking out sapphire@3.0" +git clone --depth=100 --quiet -b 3.0 git://github.com/silverstripe/sapphire.git $BUILD_DIR/framework # Copy setup files cp $BUILD_DIR/framework/tests/travis/_ss_environment.php $BUILD_DIR