Update doc

Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
This commit is contained in:
Jeremy Benoist 2016-10-04 10:25:49 +02:00
parent ca8f9bdc15
commit f440e28281
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
9 changed files with 11 additions and 13 deletions

View file

@ -61,9 +61,7 @@ matrix:
group: edge
env: DB=sqlite
- php: 7.0
env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
- php: 7.0
env: DB=sqlite ASSETS=build
env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
allow_failures:
- php: hhvm-3.12
- php: 7.1
@ -94,7 +92,7 @@ before_install:
script:
- travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
- ant prepare-$DB
- if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; then phpunit -v ; fi;
- if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; 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

@ -10,14 +10,14 @@ More informations on our website: [wallabag.org](https://wallabag.org)
# Install wallabag
If you don't have it yet, please [install composer](https://getcomposer.org/download/) or be sure to use Composer 1.2 (`composer selfupdate` can help you about that). Read [our documentation](http://doc.wallabag.org) to have more information about installation.
If you don't have it yet, please [install composer](https://getcomposer.org/download/) or be sure to use Composer 1.2 (`composer selfupdate` can help you about that). Read [our documentation](http://doc.wallabag.org) to have more information about installation.
Then you can install wallabag by executing the following commands:
```
git clone https://github.com/wallabag/wallabag.git
cd wallabag
git checkout 2.1.0
ASSETS=build ./install.sh
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console server:run --env=prod
```

View file

@ -5,4 +5,4 @@ parameters:
test_database_name: ~
test_database_user: ~
test_database_password: ~
test_database_path: "%kernel.root_dir%/../data/db/wallabag_testHU.sqlite"
test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"

View file

@ -55,7 +55,7 @@ Um wallabag selbst zu installieren, musst du die folgenden Kommandos ausführen:
git clone https://github.com/wallabag/wallabag.git
cd wallabag
git checkout 2.1.0
ASSETS=build ./install.sh
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console wallabag:install --env=prod
Um PHPs eingebauten Server zu starten und zu testen, ob alles korrekt installiert wurde, kannst du folgendes Kommando ausführen:

View file

@ -15,7 +15,7 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm
git fetch origin
git fetch --tags
git checkout 2.1.0
ASSETS=build ./install.sh
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console doctrine:migrations:migrate --env=prod
php bin/console cache:clear --env=prod

View file

@ -54,7 +54,7 @@ To install wallabag itself, you must run the following commands:
git clone https://github.com/wallabag/wallabag.git
cd wallabag
git checkout 2.1.0
ASSETS=build ./install.sh
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console wallabag:install --env=prod
To start PHP's build-in server and test if everything did install correctly, you can do:

View file

@ -15,7 +15,7 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba
git fetch origin
git fetch --tags
git checkout 2.1.0
ASSETS=build ./install.sh
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console doctrine:migrations:migrate --env=prod
php bin/console cache:clear --env=prod

View file

@ -52,7 +52,7 @@ Pour installer wallabag, vous devez exécuter ces commandes :
git clone https://github.com/wallabag/wallabag.git
cd wallabag
git checkout 2.1.0
ASSETS=build ./install.sh
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console wallabag:install --env=prod
Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter :

View file

@ -15,7 +15,7 @@ La dernière version de wallabag est publiée à cette adresse : https://www.wal
git fetch origin
git fetch --tags
git checkout 2.1.0
ASSETS=build ./install.sh
SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
php bin/console doctrine:migrations:migrate --env=prod
php bin/console cache:clear --env=prod