diff --git a/.scripts/travis_setup.sh b/.scripts/travis_setup.sh index 3123d11f..12c8c5a0 100755 --- a/.scripts/travis_setup.sh +++ b/.scripts/travis_setup.sh @@ -3,16 +3,16 @@ mysql -u root -e 'create database drupal;' mysql -u root -e "GRANT ALL PRIVILEGES ON drupal.* To 'drupal'@'localhost' IDENTIFIED BY 'drupal';" # Java (Oracle) -sudo apt-get install -y software-properties-common -sudo apt-get install -y python-software-properties -sudo add-apt-repository -y ppa:webupd8team/java -sudo apt-get update -echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections -echo debconf shared/accepted-oracle-license-v1-1 seen true | sudo debconf-set-selections -sudo apt-get install -y oracle-java8-installer -sudo update-java-alternatives -s java-8-oracle -sudo apt-get install -y oracle-java8-set-default -export JAVA_HOME=/usr/lib/jvm/java-8-oracle +#sudo apt-get install -y software-properties-common +#sudo apt-get install -y python-software-properties +#sudo add-apt-repository -y ppa:webupd8team/java +#sudo apt-get update +#echo debconf shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections +#echo debconf shared/accepted-oracle-license-v1-1 seen true | sudo debconf-set-selections +#sudo apt-get install -y oracle-java8-installer +#sudo update-java-alternatives -s java-8-oracle +#sudo apt-get install -y oracle-java8-set-default +#export JAVA_HOME=/usr/lib/jvm/java-8-oracle # phpcpd #sudo apt-get install -y phpcpd diff --git a/.travis.yml b/.travis.yml index ebb1bc0d..052abaa7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ before_install: - export ISLANDORA_DIR=$TRAVIS_BUILD_DIR install: -# - $TRAVIS_BUILD_DIR/tests/scripts/travis_setup.sh + - $TRAVIS_BUILD_DIR/tests/scripts/travis_setup.sh - composer install - php vendor/bin/phpcs --config-set installed_paths vendor/drupal/coder/coder_sniffer @@ -29,7 +29,7 @@ script: - $ISLANDORA_DIR/.scripts/line_endings.sh . - php vendor/bin/phpcs --standard=Drupal **/*.module **/*.php --ignore=tests,vendor . - php vendor/bin/phpcpd --names *.module,*.inc,*.test,*.php --exclude=vendor . - - php core/scripts/run-tests.sh islandora + - php /var/www/html/drupal/core/scripts/run-tests.sh islandora notifications: irc: