From 5ecdfcd041767c9e3244a92bb0a6cc3c3f80fea3 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 8 Mar 2016 17:02:34 +0100 Subject: manage assets through npm first draft remote assetic totally work nearly there use at least nodejs > 0.12 use proper version of grunt bump nodejs version for travis update npm workaround for materialize install node 5.0 add grunt-cli baggy theme & cache node modules cache bower & npm make travis build assets on php7 only exclude installing node & npm if not needed & use bash clean & try to make icomoon work on baggy ready config for travis rebase make travis work more travis work impove travis & update deps add missing pixrem deps add module through oddly lost ui updates install latest nodejs add install_dev.sh, link local binaries for npm/bower/grunt ui improvements (mostly baggy) fix travis build no need to install on travis Add unread filter to entries pages Add the ability to filter for unread pages in the filters menu. Add unread filter test to EntryControllerTest Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved. Improve English translation Update FAQ -Fix grammar -Add notes about MTA, firewall, and SELinux Update installation instructions -Fix grammar -Add SELinux section add screenshots of android docu in English Fix the deletion of Tags/Entries relation when delete an entry Fix #2121 Move fixtures to the right place Display a message when saving an entry failed When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too. Change ManyToMany between entry & tag Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed Prepare wallabag 2.0.5 enforce older materialize version --- .travis.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index d397c872..0e72d207 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,9 @@ cache: directories: - vendor - $HOME/.composer/cache + - node_modules + - $HOME/.cache/bower + - $HOME/.npm php: - 5.5 @@ -22,16 +25,21 @@ php: - 7.0 - hhvm +node_js: + - "5" + env: - - DB=mysql - - DB=pgsql - - DB=sqlite + - DB=mysql ASSETS=nobuild + - DB=pgsql ASSETS=nobuild + - DB=sqlite ASSETS=nobuild matrix: fast_finish: true include: - php: 7.0 - env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite + env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite ASSETS=nobuild + - php: 7.0 + env: DB=sqlite ASSETS=build exclude: - php: hhvm env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency @@ -49,11 +57,15 @@ before_script: - composer self-update --no-progress - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; +install: + - if [[ $ASSETS != nobuild ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi; + - if [[ $ASSETS != nobuild ]]; then npm install -g npm@latest; fi; + before_install: - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; script: - - travis_wait composer install --no-interaction --no-progress --prefer-dist -o + - travis_wait bash install.sh - ant prepare-$DB - bin/phpunit -v - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi; -- cgit v1.2.3 From db4d63fc1ae513335b751beb8f89e1eed61871c2 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 24 Jul 2016 11:15:51 +0200 Subject: Upgrade PHPUnit to version 5 - Fix deprecated getMock - Use PHPUnit 4 for PHP 5.5 build Manually cherry-picked from PR https://github.com/wallabag/wallabag/pull/2201 --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index dd8815c1..69b4f919 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,6 +55,7 @@ branches: before_script: - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi; - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi; + - if [ "$TRAVIS_PHP_VERSION" = "5.5" ]; then composer require "phpunit/phpunit:4.*" --no-update; fi; - composer self-update --no-progress - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; -- cgit v1.2.3 From 40c47f7023577d410818569b3be953c4aa2604cc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Fri, 9 Sep 2016 21:30:13 +0200 Subject: Check if asset is enable instead of opposite Instead of defining ASSETS all the time, just define it when we want to use it Might give us more clearer build --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index c343d5ae..749b8ef7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,9 +30,9 @@ node_js: - "5" env: - - DB=mysql ASSETS=nobuild - - DB=pgsql ASSETS=nobuild - - DB=sqlite ASSETS=nobuild + - DB=mysql + - DB=pgsql + - DB=sqlite matrix: fast_finish: true @@ -57,7 +57,7 @@ matrix: group: edge env: DB=sqlite - php: 7.0 - env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite ASSETS=nobuild + env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite - php: 7.0 env: DB=sqlite ASSETS=build allow_failures: @@ -77,11 +77,11 @@ before_script: - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi; - composer self-update --no-progress - - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; + - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; install: - - if [[ $ASSETS != nobuild ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi; - - if [[ $ASSETS != nobuild ]]; then npm install -g npm@latest; fi; + - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi; + - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi; before_install: - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; @@ -90,5 +90,5 @@ script: - travis_wait bash install.sh - ant prepare-$DB - phpunit -v - - 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 [[ $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; -- cgit v1.2.3 From e31ee20dd7ed0f92e5c41c35a0876529d0b03436 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 15 Feb 2016 20:35:28 +0100 Subject: Add RabbitMQ service for Travis CI --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 749b8ef7..918d15fe 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,8 @@ language: php +services: + - rabbitmq + # faster builds on docker-container setup sudo: false -- cgit v1.2.3 From 7230e4c39f84e5aca97f439953adfd265b8d9ba4 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 11 Sep 2016 18:19:41 +0200 Subject: Enable Redis on Travis Add generated files from `composer up` Add more articles for Readability tests --- .travis.yml | 1 + 1 file changed, 1 insertion(+) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 918d15fe..c5fe7b01 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: php services: - rabbitmq + - redis # faster builds on docker-container setup sudo: false -- cgit v1.2.3 From 4ac780eb21f1cceeca34e698e6865d49ec7d3ee8 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Mon, 3 Oct 2016 14:33:05 +0200 Subject: Use install_dev.sh for Travis Add `--no-dev` to `composer install` for prod env --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index c5fe7b01..b0b26b56 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; -- cgit v1.2.3 From 5759c9aac1f13f2776319c3f249acb4c97ea14d8 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 3 Oct 2016 23:21:02 +0200 Subject: remove install scripts and tweak travis --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index b0b26b56..9973bcae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -91,8 +91,9 @@ before_install: - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; script: - - travis_wait bash install_dev.sh + - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist - ant prepare-$DB - - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi; + - if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; 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; -- cgit v1.2.3 From 96a99d4375accdcd2ca119849996c0a2c5bf4c0d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 4 Oct 2016 01:00:14 +0200 Subject: Fix grunt path --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 9973bcae..f0a490c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,4 +96,4 @@ script: - if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; 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; + - if [[ $ASSETS = build ]]; then node_modules/grunt/bin/grunt; fi; -- cgit v1.2.3 From 10f51f429d946831096510595207820e5a22d2c5 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 4 Oct 2016 07:25:05 +0200 Subject: Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index f0a490c1..3cd59c5f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,4 +96,4 @@ script: - if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; 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/bin/grunt; fi; + - if [[ $ASSETS = build ]]; then grunt; fi; -- cgit v1.2.3 From ca8f9bdc1507e8a1f1d7500fb52a0dcb64de237a Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 4 Oct 2016 10:10:36 +0200 Subject: Fix font & Travis Grunt now copy fonts instead of symlink (node_modules won't exist for the end user) --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 3cd59c5f..821ae48f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,6 +86,7 @@ before_script: install: - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi; - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi; + - if [[ $ASSETS = build ]]; then npm install; fi; before_install: - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi; @@ -96,4 +97,4 @@ script: - if [[ $VALIDATE_TRANSLATION_FILE = '' || $ASSETS = '' ]]; 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 grunt; fi; + - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt; fi; -- cgit v1.2.3 From f440e282819a1e92e3200cf2e588fc9a0c1278ac Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 4 Oct 2016 10:25:49 +0200 Subject: Update doc Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis) --- .travis.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 821ae48f..28f068b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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; -- cgit v1.2.3 From 9a6ac0b47a75f7cc8c8541b3e3fd3f40a3712f4f Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Tue, 4 Oct 2016 11:20:58 +0200 Subject: =?UTF-8?q?=F0=9F=91=8B=20HHVM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 20 -------------------- 1 file changed, 20 deletions(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index b0b26b56..4170ff04 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,31 +41,11 @@ env: matrix: fast_finish: true include: - # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency - - php: hhvm-3.12 - sudo: required - dist: trusty - group: edge - env: DB=mysql - addons: - apt: - packages: - - mysql-server-5.6 - - mysql-client-core-5.6 - - mysql-client-5.6 - services: - - mysql - - php: hhvm-3.12 - sudo: required - dist: trusty - 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 allow_failures: - - php: hhvm-3.12 - php: 7.1 - php: nightly -- cgit v1.2.3 From 9f7d154e3451f1ccc1d69f0013e98acf4639c63b Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Tue, 4 Oct 2016 12:14:28 +0200 Subject: Add eslint & stylelint tests (fix a few things) and move dependencies to dev --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index 28f068b9..b9672936 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,4 +95,4 @@ script: - 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; + - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt tests; fi; -- cgit v1.2.3 From 3c00779dc3e36aa52f9d520bf6b615511ae39d17 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Wed, 5 Oct 2016 15:05:42 +0200 Subject: try to reduce assets build npm connection failing by updating nodejs --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis.yml') diff --git a/.travis.yml b/.travis.yml index f1334f52..c7bb05fb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,7 +62,7 @@ before_script: - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi; install: - - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi; + - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi; - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi; - if [[ $ASSETS = build ]]; then npm install; fi; -- cgit v1.2.3