From 43c2822d1d25b6b7e8bf152e2378e38384788d13 Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Thu, 16 Jul 2015 04:52:30 -0700 Subject: [PATCH 1/4] Update .travis.yml --- .travis.yml | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 08c7337..0978528 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,8 @@ language: php sudo: false + + php: - 5.3 - 5.4 @@ -21,6 +23,11 @@ branches: only: - "7.x-1.x" - "8.x-1.x" + +cache: + apt: true + directories: + - $HOME/drupal-ti-cache matrix: fast_finish: true @@ -66,6 +73,19 @@ env: # Debug options #- DRUPAL_TI_DEBUG="-x -v" + # Cache options + # Use this variable to use another cache directory, usually not needed to be changed. + - DRUPAL_TI_CACHE_DIR="$HOME/drupal-ti-cache/" + # Set to 0 or comment out to disable cache loading. + - DRUPAL_TI_LOAD_CACHE="1" + # Set to 0 to disable cache saving, useful with many variants. + # Note: Setting this to "0" will remove the .casher directory to + # avoid race conditions between builds. + - DRUPAL_TI_SAVE_CACHE="1" + # Setup dirs to cache relative to another environment variable. + - DRUPAL_TI_CACHE_DIRS_HOME=".composer|.drush|.dist" + - DRUPAL_TI_CACHE_DIRS_TRAVIS_BUILD_DIR="tests/vendor" + matrix: - DRUPAL_TI_RUNNERS="phpunit" - DRUPAL_TI_RUNNERS="phpunit simpletest" @@ -76,9 +96,22 @@ mysql: encoding: utf8 before_install: - - cd ./tests + # Restore home directory from cache. + - mkdir -p "$DRUPAL_TI_CACHE_DIR"/HOME + - if [ "$DRUPAL_TI_LOAD_CACHE" = "1" ]; then rsync -a "$DRUPAL_TI_CACHE_DIR"/HOME/ "$HOME/"; fi + + # Update composer - composer self-update + + # Download drupal_ti - composer global require "lionsad/drupal_ti:dev-master" + + # Restore caches from $DRUPAL_TI_CACHE_DIR/TRAVIS_BUILD_DIR to $TRAVIS_BUILD_DIR + # Note: HOME dir was already synced manually above. + - drupal-ti --load-cache TRAVIS_BUILD_DIR + + # Setup tests + - cd ./tests - drupal-ti before_install install: @@ -90,6 +123,21 @@ before_script: script: - drupal-ti script + # Syncs $DRUPAL_TI_CACHE_DIRS_{*} to $DRUPAL_TI_CACHE_DIR/{*} + # Has internal optimizations for .composer and .drush. + - drupal-ti --save-cache TRAVIS_BUILD_DIR HOME + + # Do some manual caching as well + - if [ "$DRUPAL_TI_SAVE_CACHE" = "1" ]; then rsync -a composer.{json,lock} "$DRUPAL_TI_CACHE_DIR"/TRAVIS_BUILD_DIR/tests/; fi + + # Delete composer generated files that screw up cache detection. + - rm -f "$DRUPAL_TI_CACHE_DIR"/TRAVIS_BUILD_DIR/tests/.composer/vendor/composer/*.php + - rm -f "$DRUPAL_TI_CACHE_DIR"/TRAVIS_BUILD_DIR/tests/.composer/vendor/autoload.php + + # Tests for differences and touches a file if any are detected (optional). + - du -sh "$DRUPAL_TI_CACHE_DIR" + - drupal-ti --sync-cache + after_script: - drupal-ti after_script From 243507033672dbce84ff3c8b783dc50e8bbd6477 Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Thu, 16 Jul 2015 06:13:00 -0700 Subject: [PATCH 2/4] Update .travis.yml --- .travis.yml | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0978528..f4ce056 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,12 @@ language: php sudo: false - - php: - 5.3 - 5.4 - 5.5 - 5.6 + - 7 - hhvm branches: @@ -32,17 +31,10 @@ cache: matrix: fast_finish: true allow_failures: - - php: 5.6 - php: hhvm - exclude: + include: # Don't need to test twice on all versions, PHP 5.4 is enough. - - php: 5.3 - env: DRUPAL_TI_RUNNERS="phpunit" - - php: 5.5 - env: DRUPAL_TI_RUNNERS="phpunit" - - php: 5.6 - env: DRUPAL_TI_RUNNERS="phpunit" - - php: hhvm + - php: 5.4 env: DRUPAL_TI_RUNNERS="phpunit" env: @@ -87,7 +79,7 @@ env: - DRUPAL_TI_CACHE_DIRS_TRAVIS_BUILD_DIR="tests/vendor" matrix: - - DRUPAL_TI_RUNNERS="phpunit" + #- DRUPAL_TI_RUNNERS="phpunit" - DRUPAL_TI_RUNNERS="phpunit simpletest" mysql: From e56d8f550bf402cd2b84df6c33ffa09b1766034e Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Thu, 16 Jul 2015 06:21:16 -0700 Subject: [PATCH 3/4] Update .travis.yml --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f4ce056..4d38437 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,10 +32,11 @@ matrix: fast_finish: true allow_failures: - php: hhvm + - php: 7 include: # Don't need to test twice on all versions, PHP 5.4 is enough. - php: 5.4 - env: DRUPAL_TI_RUNNERS="phpunit" + env: DRUPAL_TI_RUNNERS="phpunit" DRUPAL_TI_SAVE_CACHE="0" env: global: From 3692def69e6f56ad0732db74cd93a16e9f1d674a Mon Sep 17 00:00:00 2001 From: Fabian Franz Date: Thu, 16 Jul 2015 06:36:51 -0700 Subject: [PATCH 4/4] Update .travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d38437..6e6eb26 100644 --- a/.travis.yml +++ b/.travis.yml @@ -96,8 +96,8 @@ before_install: # Update composer - composer self-update - # Download drupal_ti - - composer global require "lionsad/drupal_ti:dev-master" + # Download drupal_ti - if not cached + - if [ -f "$HOME/.composer/vendor/bin/drupal-ti" ]; then composer global install; else composer global require "lionsad/drupal_ti:dev-master"; fi # Restore caches from $DRUPAL_TI_CACHE_DIR/TRAVIS_BUILD_DIR to $TRAVIS_BUILD_DIR # Note: HOME dir was already synced manually above.