From 8fdb5e5766a6bf5970f268200a6c21fd39693637 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 3 Oct 2016 14:21:49 +0200 Subject: [PATCH 1/3] Re-add wallabag:install --- docs/de/user/installation.rst | 1 + docs/en/user/installation.rst | 1 + docs/fr/user/installation.rst | 1 + 3 files changed, 3 insertions(+) diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst index f7bc2e4f7..7fa8c625e 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst @@ -56,6 +56,7 @@ Um wallabag selbst zu installieren, musst du die folgenden Kommandos ausführen: cd wallabag git checkout 2.1.0 ASSETS=build ./install.sh + 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: diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 7954fe0b3..82fa6f4e2 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -55,6 +55,7 @@ To install wallabag itself, you must run the following commands: cd wallabag git checkout 2.1.0 ASSETS=build ./install.sh + php bin/console wallabag:install --env=prod To start PHP's build-in server and test if everything did install correctly, you can do: diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst index f9777890e..bb4de534f 100644 --- a/docs/fr/user/installation.rst +++ b/docs/fr/user/installation.rst @@ -53,6 +53,7 @@ Pour installer wallabag, vous devez exécuter ces commandes : cd wallabag git checkout 2.1.0 ASSETS=build ./install.sh + 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 : From 4ac780eb21f1cceeca34e698e6865d49ec7d3ee8 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 3 Oct 2016 14:33:05 +0200 Subject: [PATCH 2/3] Use install_dev.sh for Travis Add `--no-dev` to `composer install` for prod env --- .travis.yml | 4 ++-- install.sh | 20 +++++++++----------- install_dev.sh | 17 +++++++++-------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index c5fe7b01d..b0b26b56e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,8 +91,8 @@ before_install: - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; script: - - travis_wait bash install.sh + - travis_wait bash install_dev.sh - ant prepare-$DB - - phpunit -v + - 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; diff --git a/install.sh b/install.sh index 29b343b29..87d53bf09 100755 --- a/install.sh +++ b/install.sh @@ -1,15 +1,13 @@ #! /usr/bin/env bash -if [[ $ASSETS == 'build' ]]; then - echo "Installing PHP dependencies through Composer..." - composer install --no-interaction --no-progress --prefer-dist -o +echo " > Installing PHP dependencies through Composer..." +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 +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 -else - composer install --no-interaction --no-progress --prefer-dist -o -fi +echo " > Concat, minify and installing assets..." +node_modules/grunt/bin/grunt + +echo " > Install finished" diff --git a/install_dev.sh b/install_dev.sh index 61a4f6fd4..cbd474953 100755 --- a/install_dev.sh +++ b/install_dev.sh @@ -1,13 +1,14 @@ #! /usr/bin/env bash -echo "Installing PHP dependencies (including dev) through Composer..." -composer install +echo " > Installing PHP dependencies (including dev) through Composer..." +composer install -o --no-interaction --no-progress --prefer-dist -echo "Downloading librairies through npm..." -npm install +if [[ $ASSETS == 'build' || $TRAVIS_BUILD_DIR == '' ]]; then + echo " > Downloading librairies through npm..." + npm install -echo "Concat, minify and installing assets..." -grunt + echo " > Concat, minify and installing assets..." + grunt +fi -echo "Installing wallabag..." -php bin/console wallabag:install +echo " > Install finished" From 88d8125a5fa3b5c6c91cb22fc2bef1243d7391fc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 3 Oct 2016 14:44:12 +0200 Subject: [PATCH 3/3] Ensure cache is clear before upgrading If we changed some namespace / classes, we need to refresh the cache before anything else. --- docs/de/user/upgrade-2.0.x-2.0.y.rst | 1 + docs/de/user/upgrade-2.0.x-2.1.y.rst | 1 + docs/en/user/upgrade-2.0.x-2.0.y.rst | 1 + docs/en/user/upgrade-2.0.x-2.1.y.rst | 1 + docs/fr/user/upgrade-2.0.x-2.0.y.rst | 1 + docs/fr/user/upgrade-2.0.x-2.1.y.rst | 1 + 6 files changed, 6 insertions(+) diff --git a/docs/de/user/upgrade-2.0.x-2.0.y.rst b/docs/de/user/upgrade-2.0.x-2.0.y.rst index adf288bd5..5820a0d23 100644 --- a/docs/de/user/upgrade-2.0.x-2.0.y.rst +++ b/docs/de/user/upgrade-2.0.x-2.0.y.rst @@ -8,6 +8,7 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.0.8 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 23bf36828..7c20f4ee8 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 @@ -11,6 +11,7 @@ Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.htm :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.1.0 diff --git a/docs/en/user/upgrade-2.0.x-2.0.y.rst b/docs/en/user/upgrade-2.0.x-2.0.y.rst index 6a0818b3a..3391c2cd7 100644 --- a/docs/en/user/upgrade-2.0.x-2.0.y.rst +++ b/docs/en/user/upgrade-2.0.x-2.0.y.rst @@ -8,6 +8,7 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.0.8 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 63a77e7c8..234045ba4 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 @@ -11,6 +11,7 @@ The last release is published on https://www.wallabag.org/pages/download-wallaba :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.1.0 diff --git a/docs/fr/user/upgrade-2.0.x-2.0.y.rst b/docs/fr/user/upgrade-2.0.x-2.0.y.rst index d8dfac6eb..8d8ad806d 100644 --- a/docs/fr/user/upgrade-2.0.x-2.0.y.rst +++ b/docs/fr/user/upgrade-2.0.x-2.0.y.rst @@ -8,6 +8,7 @@ La dernière version de wallabag est publiée à cette adresse : https://www.wal :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.0.8 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 dc66682a5..fdd1f0cbb 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 @@ -11,6 +11,7 @@ La dernière version de wallabag est publiée à cette adresse : https://www.wal :: + rm -rf var/cache/* git fetch origin git fetch --tags git checkout 2.1.0