From 8ca7db885211a1c23e33a1bd41f960a724a4187f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Wed, 13 Dec 2017 20:41:19 +0100 Subject: [PATCH 1/3] Use stable packages This will make it easier to contribute. It will also make reviews safer since you will be able to tell if a PR is reponsible for a broken build or not. Catching errors early is still possible by having a look at allowed failures. --- .travis.yml | 7 +++++-- composer.json | 1 - 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5399c90ac..75aa80908 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,8 +56,10 @@ jobs: install: travis_retry composer update --prefer-dist --prefer-lowest - stage: Test - env: DB=sqlite DEPENDENCIES=stable - install: travis_retry composer update --prefer-dist --prefer-stable + env: DB=sqlite STABILITY=dev + install: + - composer config minimum-stability $STABILITY + - travis_retry composer update --prefer-dist - stage: Test env: DB=sqlite COVERAGE @@ -91,6 +93,7 @@ jobs: allow_failures: - php: nightly + - env: DB=sqlite STABILITY=dev cache: directories: diff --git a/composer.json b/composer.json index fad4b22ff..291241728 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,6 @@ {"name": "Jonathan Wage", "email": "jonwage@gmail.com"}, {"name": "Marco Pivetta", "email": "ocramius@gmail.com"} ], - "minimum-stability": "dev", "config": { "sort-packages": true }, From ad3c3f41143160d0a436e4d402c51298bb4596df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Sun, 17 Dec 2017 20:38:36 +0100 Subject: [PATCH 2/3] Implement conditional build This will make cron builds fail, which is a bit more noticeable than an allowed failure. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 75aa80908..cb0c62201 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,9 +56,10 @@ jobs: install: travis_retry composer update --prefer-dist --prefer-lowest - stage: Test - env: DB=sqlite STABILITY=dev + if: type = cron + env: DB=sqlite install: - - composer config minimum-stability $STABILITY + - composer config minimum-stability dev - travis_retry composer update --prefer-dist - stage: Test @@ -93,7 +94,6 @@ jobs: allow_failures: - php: nightly - - env: DB=sqlite STABILITY=dev cache: directories: From 8e3c3f0baeadaf67c374d5da727cf226b67dad50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Mon, 18 Dec 2017 00:14:00 +0100 Subject: [PATCH 3/3] Add marker variable for Travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cb0c62201..50ee769a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,7 +57,7 @@ jobs: - stage: Test if: type = cron - env: DB=sqlite + env: DB=sqlite DEV_DEPENDENCIES install: - composer config minimum-stability dev - travis_retry composer update --prefer-dist