From 1ef155fc188acfad6c08799f1498b860ed0ea8cf Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 18 Feb 2013 14:13:24 +0100 Subject: [PATCH] Hardcode travis branch on dependencies, otherwise breaks pull request builds Pull requests are always on a branch, and this branch typically is not present on the installer. This changes means we need to be careful when merging into 3.1 and master, but that's a necessary evil. --- tests/travis/before_script | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/travis/before_script b/tests/travis/before_script index 94f244f8..c54f6c6b 100755 --- a/tests/travis/before_script +++ b/tests/travis/before_script @@ -15,8 +15,8 @@ echo "" # Fetch all dependencies # TODO Replace with different composer.json variations -echo "Checking out installer@$TRAVIS_BRANCH" -git clone --depth=100 --quiet -b $TRAVIS_BRANCH git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR +echo "Checking out installer@3.0" +git clone --depth=100 --quiet -b 3.0 git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR echo "Checking out sqlite3@master" git clone --depth=100 --quiet git://github.com/silverstripe-labs/silverstripe-sqlite3.git $BUILD_DIR/sqlite3 @@ -24,8 +24,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