Skip to content

Commit a428a24

Browse files
committed
Update CI configs from the latest grunt-contrib-internal.
1 parent f680e89 commit a428a24

File tree

3 files changed

+42
-17
lines changed

3 files changed

+42
-17
lines changed

.travis.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
sudo: false
22
language: node_js
33
node_js:
4-
- '5'
5-
- '4'
6-
- '0.10'
4+
- "0.10"
5+
- "0.12"
6+
- "4"
7+
- "5"
8+
- "iojs"
9+
before_install:
10+
- if [ "$TRAVIS_NODE_VERSION" = "0.10" ]; then npm install -g npm@2; fi
11+
matrix:
12+
fast_finish: true
13+
cache:
14+
directories:
15+
- node_modules

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,13 +176,13 @@ Turn on preservation of comments.
176176
Type: `String`
177177
Default: `''`
178178

179-
This string will be prepended to the minified output. Template strings (e.g. `<%= config.value %>` will be expanded automatically.
179+
This string will be prepended to the minified output. Template strings (e.g. `<%= config.value %>` will be expanded automatically.
180180

181181
#### footer
182182
Type: `String`
183183
Default: `''`
184184

185-
This string will be appended to the minified output. Template strings (e.g. `<%= config.value %>` will be expanded automatically.
185+
This string will be appended to the minified output. Template strings (e.g. `<%= config.value %>` will be expanded automatically.
186186

187187
#### screwIE8
188188
Type: `Boolean`
@@ -433,7 +433,7 @@ grunt.initConfig({
433433
options: {
434434
compress: {
435435
global_defs: {
436-
"DEBUG": false
436+
'DEBUG': false
437437
},
438438
dead_code: true
439439
}
@@ -554,4 +554,4 @@ grunt.initConfig({
554554

555555
Task submitted by ["Cowboy" Ben Alman](http://benalman.com)
556556

557-
*This file was generated on Fri Mar 18 2016 21:02:15.*
557+
*This file was generated on Thu Apr 07 2016 15:29:35.*

appveyor.yml

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,44 @@
1-
# AppVeyor file
21
# http://www.appveyor.com/docs/appveyor-yml
32

4-
version: "{build}"
5-
63
clone_depth: 10
74

5+
version: "{build}"
6+
7+
# What combinations to test
88
environment:
99
matrix:
10-
- nodejs_version: "5"
11-
- nodejs_version: "4"
1210
- nodejs_version: "0.10"
11+
platform: x86
12+
- nodejs_version: "0.12"
13+
platform: x86
14+
- nodejs_version: "4"
15+
platform: x64
16+
- nodejs_version: "4"
17+
platform: x86
18+
- nodejs_version: "5"
19+
platform: x86
1320

1421
install:
15-
- ps: Install-Product node $env:nodejs_version
22+
- ps: Install-Product node $env:nodejs_version $env:platform
23+
- ps: >-
24+
if ($env:nodejs_version -eq "0.10") {
25+
npm -g install npm@2
26+
$env:PATH="$env:APPDATA\npm;$env:PATH"
27+
}
1628
- npm install
1729

18-
build: off
19-
2030
test_script:
31+
# Output useful info for debugging
2132
- node --version && npm --version
22-
- npm test
33+
# We test multiple Windows shells because of prior stdout buffering issues
34+
# filed against Grunt. https://github.com/joyent/node/issues/3584
35+
- ps: "npm test # PowerShell" # Pass comment to PS for easier debugging
36+
- cmd: npm test
37+
38+
build: off
2339

2440
matrix:
2541
fast_finish: true
2642

2743
cache:
28-
- 'node_modules -> package.json' # local npm modules
44+
- node_modules -> package.json

0 commit comments

Comments
 (0)