From a428a24ccc9ad1a0c61efe62869e1af000f089e3 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Thu, 7 Apr 2016 15:33:09 +0300 Subject: [PATCH] Update CI configs from the latest grunt-contrib-internal. --- .travis.yml | 15 ++++++++++++--- README.md | 8 ++++---- appveyor.yml | 36 ++++++++++++++++++++++++++---------- 3 files changed, 42 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 16b46b78..f63bfebf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,15 @@ sudo: false language: node_js node_js: - - '5' - - '4' - - '0.10' + - "0.10" + - "0.12" + - "4" + - "5" + - "iojs" +before_install: + - if [ "$TRAVIS_NODE_VERSION" = "0.10" ]; then npm install -g npm@2; fi +matrix: + fast_finish: true +cache: + directories: + - node_modules diff --git a/README.md b/README.md index be32a41d..9d091fef 100644 --- a/README.md +++ b/README.md @@ -176,13 +176,13 @@ Turn on preservation of comments. Type: `String` Default: `''` -This string will be prepended to the minified output. Template strings (e.g. `<%= config.value %>` will be expanded automatically. +This string will be prepended to the minified output. Template strings (e.g. `<%= config.value %>` will be expanded automatically. #### footer Type: `String` Default: `''` -This string will be appended to the minified output. Template strings (e.g. `<%= config.value %>` will be expanded automatically. +This string will be appended to the minified output. Template strings (e.g. `<%= config.value %>` will be expanded automatically. #### screwIE8 Type: `Boolean` @@ -433,7 +433,7 @@ grunt.initConfig({ options: { compress: { global_defs: { - "DEBUG": false + 'DEBUG': false }, dead_code: true } @@ -554,4 +554,4 @@ grunt.initConfig({ Task submitted by ["Cowboy" Ben Alman](http://benalman.com) -*This file was generated on Fri Mar 18 2016 21:02:15.* +*This file was generated on Thu Apr 07 2016 15:29:35.* diff --git a/appveyor.yml b/appveyor.yml index 7ad50085..a196c5e1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,28 +1,44 @@ -# AppVeyor file # http://www.appveyor.com/docs/appveyor-yml -version: "{build}" - clone_depth: 10 +version: "{build}" + +# What combinations to test environment: matrix: - - nodejs_version: "5" - - nodejs_version: "4" - nodejs_version: "0.10" + platform: x86 + - nodejs_version: "0.12" + platform: x86 + - nodejs_version: "4" + platform: x64 + - nodejs_version: "4" + platform: x86 + - nodejs_version: "5" + platform: x86 install: - - ps: Install-Product node $env:nodejs_version + - ps: Install-Product node $env:nodejs_version $env:platform + - ps: >- + if ($env:nodejs_version -eq "0.10") { + npm -g install npm@2 + $env:PATH="$env:APPDATA\npm;$env:PATH" + } - npm install -build: off - test_script: + # Output useful info for debugging - node --version && npm --version - - npm test + # We test multiple Windows shells because of prior stdout buffering issues + # filed against Grunt. https://github.com/joyent/node/issues/3584 + - ps: "npm test # PowerShell" # Pass comment to PS for easier debugging + - cmd: npm test + +build: off matrix: fast_finish: true cache: - - 'node_modules -> package.json' # local npm modules + - node_modules -> package.json