From a841f220042d799d871c006b0763fe761c9ada47 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Mon, 18 Feb 2013 14:19:36 +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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/travis/before_script b/tests/travis/before_script index cc270a4be..cc4b2bf49 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@3.1" -git clone --depth=100 --quiet -b 3.1 git://github.com/silverstripe/silverstripe-installer.git $BUILD_DIR +echo "Checking out installer@master" +git clone --depth=100 --quiet -b master 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