aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-03 14:33:05 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-03 14:35:42 +0200
commit4ac780eb21f1cceeca34e698e6865d49ec7d3ee8 (patch)
treead8b7da6eff922d5842de99f79fb3532c9b72be6
parent8fdb5e5766a6bf5970f268200a6c21fd39693637 (diff)
downloadwallabag-4ac780eb21f1cceeca34e698e6865d49ec7d3ee8.tar.gz
wallabag-4ac780eb21f1cceeca34e698e6865d49ec7d3ee8.tar.zst
wallabag-4ac780eb21f1cceeca34e698e6865d49ec7d3ee8.zip
Use install_dev.sh for Travis
Add `--no-dev` to `composer install` for prod env
-rw-r--r--.travis.yml4
-rwxr-xr-xinstall.sh24
-rwxr-xr-xinstall_dev.sh17
3 files changed, 22 insertions, 23 deletions
diff --git a/.travis.yml b/.travis.yml
index c5fe7b01..b0b26b56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -91,8 +91,8 @@ 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.sh 94 - travis_wait bash install_dev.sh
95 - ant prepare-$DB 95 - ant prepare-$DB
96 - phpunit -v 96 - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; 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;
diff --git a/install.sh b/install.sh
index 29b343b2..87d53bf0 100755
--- a/install.sh
+++ b/install.sh
@@ -1,15 +1,13 @@
1#! /usr/bin/env bash 1#! /usr/bin/env bash
2 2
3if [[ $ASSETS == 'build' ]]; then 3echo " > Installing PHP dependencies through Composer..."
4 echo "Installing PHP dependencies through Composer..." 4composer install --no-interaction --no-progress --prefer-dist -o --no-dev
5 composer install --no-interaction --no-progress --prefer-dist -o 5
6 6chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm
7 chmod ugo+x vendor/mouf/nodejs-installer/bin/local/npm 7echo " > Downloading librairies through npm..."
8 echo "Downloading librairies through npm..." 8vendor/mouf/nodejs-installer/bin/local/npm install
9 vendor/mouf/nodejs-installer/bin/local/npm install 9
10 10echo " > Concat, minify and installing assets..."
11 echo "Concat, minify and installing assets..." 11node_modules/grunt/bin/grunt
12 node_modules/grunt/bin/grunt 12
13else 13echo " > Install finished"
14 composer install --no-interaction --no-progress --prefer-dist -o
15fi
diff --git a/install_dev.sh b/install_dev.sh
index 61a4f6fd..cbd47495 100755
--- a/install_dev.sh
+++ b/install_dev.sh
@@ -1,13 +1,14 @@
1#! /usr/bin/env bash 1#! /usr/bin/env bash
2 2
3echo "Installing PHP dependencies (including dev) through Composer..." 3echo " > Installing PHP dependencies (including dev) through Composer..."
4composer install 4composer install -o --no-interaction --no-progress --prefer-dist
5 5
6echo "Downloading librairies through npm..." 6if [[ $ASSETS == 'build' || $TRAVIS_BUILD_DIR == '' ]]; then
7npm install 7 echo " > Downloading librairies through npm..."
8 npm install
8 9
9echo "Concat, minify and installing assets..." 10 echo " > Concat, minify and installing assets..."
10grunt 11 grunt
12fi
11 13
12echo "Installing wallabag..." 14echo " > Install finished"
13php bin/console wallabag:install