From 621339bb21400b89990eaa8d2b370322c3d8cedb Mon Sep 17 00:00:00 2001 From: Jonathan Green Date: Wed, 15 May 2013 19:35:05 +0000 Subject: [PATCH 1/2] Attempt to fix travis --- tests/scripts/travis_setup.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 7939215b..23f3c015 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -11,12 +11,12 @@ cd islandora_tomcat export CATALINA_HOME='.' ./bin/startup.sh cd $HOME -pyrus channel-discover pear.drush.org -pyrus channel-discover pear.phpqatools.org -pyrus channel-discover pear.netpirates.net -pyrus install drush/drush -pyrus install pear/PHP_CodeSniffer -pyrus install pear.phpunit.de/phpcpd +pear channel-discover pear.drush.org +pear channel-discover pear.phpqatools.org +pear channel-discover pear.netpirates.net +pear install drush/drush +pear install pear/PHP_CodeSniffer +pear install pear.phpunit.de/phpcpd phpenv rehash drush dl --yes drupal cd drupal-* From c68a1bbc7462de6a229ac2fe59a994932ebb49b7 Mon Sep 17 00:00:00 2001 From: jonathangreen Date: Wed, 15 May 2013 16:51:55 -0300 Subject: [PATCH 2/2] Another try at fixing travis --- tests/scripts/travis_setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/scripts/travis_setup.sh b/tests/scripts/travis_setup.sh index 23f3c015..4f4dd918 100755 --- a/tests/scripts/travis_setup.sh +++ b/tests/scripts/travis_setup.sh @@ -11,6 +11,9 @@ cd islandora_tomcat export CATALINA_HOME='.' ./bin/startup.sh cd $HOME +pear upgrade --force Console_Getopt +pear upgrade --force pear +pear upgrade-all pear channel-discover pear.drush.org pear channel-discover pear.phpqatools.org pear channel-discover pear.netpirates.net