aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.travis.yml5
-rwxr-xr-xinstall.sh13
-rwxr-xr-xinstall_dev.sh14
3 files changed, 3 insertions, 29 deletions
diff --git a/.travis.yml b/.travis.yml
index b0b26b56..9973bcae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,8 +91,9 @@ before_install:
91 - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; 91 - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
92 92
93script: 93script:
94 - travis_wait bash install_dev.sh 94 - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
95 - ant prepare-$DB 95 - ant prepare-$DB
96 - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi; 96 - if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; then phpunit -v ; fi;
97 - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; 97 - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
98 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; 98 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
99 - if [[ $ASSETS = build ]]; then node_modules/grunt-cli/bin/grunt ; fi;
diff --git a/install.sh b/install.sh
deleted file mode 100755
index fad8b4c0..00000000
--- a/install.sh
+++ /dev/null
@@ -1,13 +0,0 @@
1#! /usr/bin/env bash
2
3echo " > Installing PHP dependencies through Composer..."
4SYMFONY_ENV=prod composer install --no-interaction --no-progress --prefer-dist -o --no-dev
5
6chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm
7echo " > Downloading librairies through npm..."
8vendor/mouf/nodejs-installer/bin/local/npm install
9
10echo " > Concat, minify and installing assets..."
11node_modules/grunt/bin/grunt
12
13echo " > Install finished"
diff --git a/install_dev.sh b/install_dev.sh
deleted file mode 100755
index cbd47495..00000000
--- a/install_dev.sh
+++ /dev/null
@@ -1,14 +0,0 @@
1#! /usr/bin/env bash
2
3echo " > Installing PHP dependencies (including dev) through Composer..."
4composer install -o --no-interaction --no-progress --prefer-dist
5
6if [[ $ASSETS == 'build' || $TRAVIS_BUILD_DIR == '' ]]; then
7 echo " > Downloading librairies through npm..."
8 npm install
9
10 echo " > Concat, minify and installing assets..."
11 grunt
12fi
13
14echo " > Install finished"