From c3496b60efe8ca448c84763da3e9e25c8c9ac8e5 Mon Sep 17 00:00:00 2001 From: Samuel Demirdjian Date: Sat, 5 Sep 2015 10:39:37 +0300 Subject: [PATCH 1/6] PHP7 support --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 1313e37..9cc1da2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ php: - 5.4 - 5.5 - 5.6 + - 7.0 - hhvm before_script: From 4a51df08b88cea9e00df57fc387f7b11a9c71aaf Mon Sep 17 00:00:00 2001 From: Samuel Demirdjian Date: Sat, 19 Sep 2015 09:38:21 +0300 Subject: [PATCH 2/6] Add test with lowest PHPUnit version to Travis matrix --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 9cc1da2..b256798 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,14 @@ php: - 7.0 - hhvm +matrix: + include: + - php: 5.3 + env: 'COMPOSER_PHPUNIT="lowest"' + before_script: - composer install --prefer-dist + - if [ "$COMPOSER_PHPUNIT" = "lowest" ]; then composer update --prefer-lowest --with-dependencies phpunit/phpunit; fi; - vendor/bin/koharness script: From 95890930eaeab412d50fc9bf23f43ec459add24b Mon Sep 17 00:00:00 2001 From: Samuel Demirdjian Date: Fri, 25 Sep 2015 15:02:14 +0000 Subject: [PATCH 3/6] Migrate Travis from legacy to container-based infrastructure --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 1313e37..3e6034a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,5 @@ +sudo: false + language: php php: From f8f054feaeee970d0db53b8bf8543f9fe7a6ebef Mon Sep 17 00:00:00 2001 From: Andrew Coulton Date: Wed, 25 Nov 2015 14:10:39 +0000 Subject: [PATCH 4/6] Avoid duplicate travis builds of feature/bug branches See kohana/kohana#92 --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 05e5455..190f441 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,11 @@ sudo: false language: php +# Only build the main develop/master branches - feature branches will be covered by PRs +branches: + only: + - /^[0-9\.]+\/(develop|master)$/ + php: - 5.3 - 5.4 From a1fe3e42234b68f531ebcacec6eb6e6a72852b11 Mon Sep 17 00:00:00 2001 From: Andrew Coulton Date: Wed, 25 Nov 2015 14:10:39 +0000 Subject: [PATCH 5/6] Cache composer dependencies to speed up travis builds See kohana/kohana#92 --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 190f441..dacfadb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,11 @@ branches: only: - /^[0-9\.]+\/(develop|master)$/ +cache: + directories: + - vendor + - $HOME/.composer/cache + php: - 5.3 - 5.4 From f8b3039ee9daf668bd66fba70277bfb5a851d148 Mon Sep 17 00:00:00 2001 From: Samuel Demirdjian Date: Wed, 23 Mar 2016 17:47:13 +0200 Subject: [PATCH 6/6] Resolve composer downloading and caching issues on Travis --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index dacfadb..212f748 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,8 +9,7 @@ branches: cache: directories: - - vendor - - $HOME/.composer/cache + - $HOME/.composer/cache/files php: - 5.3 @@ -26,8 +25,9 @@ matrix: env: 'COMPOSER_PHPUNIT="lowest"' before_script: - - composer install --prefer-dist - - if [ "$COMPOSER_PHPUNIT" = "lowest" ]; then composer update --prefer-lowest --with-dependencies phpunit/phpunit; fi; + - composer self-update + - composer install --prefer-dist --no-interaction + - if [ "$COMPOSER_PHPUNIT" = "lowest" ]; then composer update --prefer-lowest --with-dependencies --prefer-dist --no-interaction phpunit/phpunit; fi; - vendor/bin/koharness script: