aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-10-04 10:25:49 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-10-04 10:31:03 +0200
commitf440e282819a1e92e3200cf2e588fc9a0c1278ac (patch)
tree7769cfd595aaba70945f7a4a50ef1f42b6f12528
parentca8f9bdc1507e8a1f1d7500fb52a0dcb64de237a (diff)
downloadwallabag-f440e282819a1e92e3200cf2e588fc9a0c1278ac.tar.gz
wallabag-f440e282819a1e92e3200cf2e588fc9a0c1278ac.tar.zst
wallabag-f440e282819a1e92e3200cf2e588fc9a0c1278ac.zip
Update doc
Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
-rw-r--r--.travis.yml6
-rw-r--r--README.md4
-rw-r--r--app/config/tests/parameters_test.sqlite.yml2
-rw-r--r--docs/de/user/installation.rst2
-rw-r--r--docs/de/user/upgrade-2.0.x-2.1.y.rst2
-rw-r--r--docs/en/user/installation.rst2
-rw-r--r--docs/en/user/upgrade-2.0.x-2.1.y.rst2
-rw-r--r--docs/fr/user/installation.rst2
-rw-r--r--docs/fr/user/upgrade-2.0.x-2.1.y.rst2
9 files changed, 11 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index 821ae48f..28f068b9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,9 +61,7 @@ matrix:
61 group: edge 61 group: edge
62 env: DB=sqlite 62 env: DB=sqlite
63 - php: 7.0 63 - php: 7.0
64 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite 64 env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
65 - php: 7.0
66 env: DB=sqlite ASSETS=build
67 allow_failures: 65 allow_failures:
68 - php: hhvm-3.12 66 - php: hhvm-3.12
69 - php: 7.1 67 - php: 7.1
@@ -94,7 +92,7 @@ before_install:
94script: 92script:
95 - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist 93 - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist
96 - ant prepare-$DB 94 - ant prepare-$DB
97 - if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; then phpunit -v ; fi; 95 - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi;
98 - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; 96 - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
99 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi; 97 - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
100 - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt; fi; 98 - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt; fi;
diff --git a/README.md b/README.md
index 6d215c89..0936f666 100644
--- a/README.md
+++ b/README.md
@@ -10,14 +10,14 @@ More informations on our website: [wallabag.org](https://wallabag.org)
10 10
11# Install wallabag 11# Install wallabag
12 12
13If 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. 13If 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.
14Then you can install wallabag by executing the following commands: 14Then you can install wallabag by executing the following commands:
15 15
16``` 16```
17 git clone https://github.com/wallabag/wallabag.git 17 git clone https://github.com/wallabag/wallabag.git
18 cd wallabag 18 cd wallabag
19 git checkout 2.1.0 19 git checkout 2.1.0
20 ASSETS=build ./install.sh 20 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
21 php bin/console server:run --env=prod 21 php bin/console server:run --env=prod
22``` 22```
23 23
diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml
index 6e9f98de..1952e3a6 100644
--- a/app/config/tests/parameters_test.sqlite.yml
+++ b/app/config/tests/parameters_test.sqlite.yml
@@ -5,4 +5,4 @@ parameters:
5 test_database_name: ~ 5 test_database_name: ~
6 test_database_user: ~ 6 test_database_user: ~
7 test_database_password: ~ 7 test_database_password: ~
8 test_database_path: "%kernel.root_dir%/../data/db/wallabag_testHU.sqlite" 8 test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst
index 7fa8c625..f9f34c3c 100644
--- a/docs/de/user/installation.rst
+++ b/docs/de/user/installation.rst
@@ -55,7 +55,7 @@ Um wallabag selbst zu installieren, musst du die folgenden Kommandos ausführen:
55 git clone https://github.com/wallabag/wallabag.git 55 git clone https://github.com/wallabag/wallabag.git
56 cd wallabag 56 cd wallabag
57 git checkout 2.1.0 57 git checkout 2.1.0
58 ASSETS=build ./install.sh 58 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
59 php bin/console wallabag:install --env=prod 59 php bin/console wallabag:install --env=prod
60 60
61Um PHPs eingebauten Server zu starten und zu testen, ob alles korrekt installiert wurde, kannst du folgendes Kommando ausführen: 61Um PHPs eingebauten Server zu starten und zu testen, ob alles korrekt installiert wurde, kannst du folgendes Kommando ausführen:
diff --git a/docs/de/user/upgrade-2.0.x-2.1.y.rst b/docs/de/user/upgrade-2.0.x-2.1.y.rst
index 7c20f4ee..7319a18a 100644
--- a/docs/de/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/de/user/upgrade-2.0.x-2.1.y.rst
@@ -15,7 +15,7 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm
15 git fetch origin 15 git fetch origin
16 git fetch --tags 16 git fetch --tags
17 git checkout 2.1.0 17 git checkout 2.1.0
18 ASSETS=build ./install.sh 18 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
19 php bin/console doctrine:migrations:migrate --env=prod 19 php bin/console doctrine:migrations:migrate --env=prod
20 php bin/console cache:clear --env=prod 20 php bin/console cache:clear --env=prod
21 21
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 82fa6f4e..756eb74c 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -54,7 +54,7 @@ To install wallabag itself, you must run the following commands:
54 git clone https://github.com/wallabag/wallabag.git 54 git clone https://github.com/wallabag/wallabag.git
55 cd wallabag 55 cd wallabag
56 git checkout 2.1.0 56 git checkout 2.1.0
57 ASSETS=build ./install.sh 57 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
58 php bin/console wallabag:install --env=prod 58 php bin/console wallabag:install --env=prod
59 59
60To start PHP's build-in server and test if everything did install correctly, you can do: 60To start PHP's build-in server and test if everything did install correctly, you can do:
diff --git a/docs/en/user/upgrade-2.0.x-2.1.y.rst b/docs/en/user/upgrade-2.0.x-2.1.y.rst
index 234045ba..ce5b5441 100644
--- a/docs/en/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/en/user/upgrade-2.0.x-2.1.y.rst
@@ -15,7 +15,7 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba
15 git fetch origin 15 git fetch origin
16 git fetch --tags 16 git fetch --tags
17 git checkout 2.1.0 17 git checkout 2.1.0
18 ASSETS=build ./install.sh 18 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
19 php bin/console doctrine:migrations:migrate --env=prod 19 php bin/console doctrine:migrations:migrate --env=prod
20 php bin/console cache:clear --env=prod 20 php bin/console cache:clear --env=prod
21 21
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index bb4de534..e8d18434 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -52,7 +52,7 @@ Pour installer wallabag, vous devez exécuter ces commandes :
52 git clone https://github.com/wallabag/wallabag.git 52 git clone https://github.com/wallabag/wallabag.git
53 cd wallabag 53 cd wallabag
54 git checkout 2.1.0 54 git checkout 2.1.0
55 ASSETS=build ./install.sh 55 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
56 php bin/console wallabag:install --env=prod 56 php bin/console wallabag:install --env=prod
57 57
58Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter : 58Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter :
diff --git a/docs/fr/user/upgrade-2.0.x-2.1.y.rst b/docs/fr/user/upgrade-2.0.x-2.1.y.rst
index fdd1f0cb..a059cfb8 100644
--- a/docs/fr/user/upgrade-2.0.x-2.1.y.rst
+++ b/docs/fr/user/upgrade-2.0.x-2.1.y.rst
@@ -15,7 +15,7 @@ La dernière version de wallabag est publiée à cette adresse : https://www.wal
15 git fetch origin 15 git fetch origin
16 git fetch --tags 16 git fetch --tags
17 git checkout 2.1.0 17 git checkout 2.1.0
18 ASSETS=build ./install.sh 18 SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
19 php bin/console doctrine:migrations:migrate --env=prod 19 php bin/console doctrine:migrations:migrate --env=prod
20 php bin/console cache:clear --env=prod 20 php bin/console cache:clear --env=prod
21 21