remove install scripts and tweak travis

This commit is contained in:
Thomas Citharel 2016-10-03 23:21:02 +02:00
parent a494c33ef7
commit 5759c9aac1
No known key found for this signature in database
GPG key ID: 5780691F5FE48FB5
3 changed files with 3 additions and 29 deletions

View file

@ -91,8 +91,9 @@ before_install:
- if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
script:
- travis_wait bash install_dev.sh
- travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
- ant prepare-$DB
- if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi;
- if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; then phpunit -v ; fi;
- if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
- if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
- if [[ $ASSETS = build ]]; then node_modules/grunt-cli/bin/grunt ; fi;

View file

@ -1,13 +0,0 @@
#! /usr/bin/env bash
echo " > Installing PHP dependencies through Composer..."
SYMFONY_ENV=prod composer install --no-interaction --no-progress --prefer-dist -o --no-dev
chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm
echo " > Downloading librairies through npm..."
vendor/mouf/nodejs-installer/bin/local/npm install
echo " > Concat, minify and installing assets..."
node_modules/grunt/bin/grunt
echo " > Install finished"

View file

@ -1,14 +0,0 @@
#! /usr/bin/env bash
echo " > Installing PHP dependencies (including dev) through Composer..."
composer install -o --no-interaction --no-progress --prefer-dist
if [[ $ASSETS == 'build' || $TRAVIS_BUILD_DIR == '' ]]; then
echo " > Downloading librairies through npm..."
npm install
echo " > Concat, minify and installing assets..."
grunt
fi
echo " > Install finished"