Skip to content

Commit 2721ad7

Browse files
authored
Merge pull request #430 from alexindigo/master
Switched windows tests from AppVeyor to Travis
2 parents 0fb2f57 + 508b626 commit 2721ad7

4 files changed

Lines changed: 7 additions & 28 deletions

File tree

.travis.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ node_js:
1111
os:
1212
- osx
1313
- linux
14+
- windows
1415

1516
install:
1617
- travis_retry npm install
@@ -19,8 +20,8 @@ script:
1920
- uname -a
2021
- node --version
2122
- npm --version
22-
- npm run ci-lint
23-
- npm run ci-test
23+
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then npm run ci-lint; fi
24+
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then npm run test; else npm run ci-test; fi
2425
- npm run check
2526

2627
after_success:

Readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The API of this library is inspired by the [XMLHttpRequest-2 FormData Interface]
88

99
[![Linux Build](https://img.shields.io/travis/form-data/form-data/master.svg?label=linux:4.x-12.x)](https://travis-ci.org/form-data/form-data)
1010
[![MacOS Build](https://img.shields.io/travis/form-data/form-data/master.svg?label=macos:4.x-12.x)](https://travis-ci.org/form-data/form-data)
11-
[![Windows Build](https://img.shields.io/appveyor/ci/alexindigo/form-data/master.svg?label=windows:4.x-12.x)](https://ci.appveyor.com/project/alexindigo/form-data)
11+
[![Windows Build](https://img.shields.io/travis/form-data/form-data/master.svg?label=windows:4.x-12.x)](https://travis-ci.org/form-data/form-data)
1212

1313
[![Coverage Status](https://img.shields.io/coveralls/form-data/form-data/master.svg?label=code+coverage)](https://coveralls.io/github/form-data/form-data?branch=master)
1414
[![Dependency Status](https://img.shields.io/david/form-data/form-data.svg)](https://david-dm.org/form-data/form-data)

appveyor.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"posttest": "istanbul report lcov text",
1717
"lint": "eslint lib/*.js test/*.js test/integration/*.js",
1818
"report": "istanbul report lcov text",
19-
"ci-lint": "is-node-modern 6 && npm run lint || is-node-not-modern 6",
19+
"ci-lint": "is-node-modern 8 && npm run lint || is-node-not-modern 8",
2020
"ci-test": "npm run test && npm run browser && npm run report",
2121
"predebug": "rimraf coverage test/tmp",
2222
"debug": "verbose=1 ./test/run.js",
@@ -46,9 +46,9 @@
4646
"devDependencies": {
4747
"browserify": "^13.1.1",
4848
"browserify-istanbul": "^2.0.0",
49-
"coveralls": "^2.11.14",
49+
"coveralls": "^3.0.4",
5050
"cross-spawn": "^4.0.2",
51-
"eslint": "^3.9.1",
51+
"eslint": "^6.0.1",
5252
"fake": "^0.2.2",
5353
"far": "^0.0.7",
5454
"formidable": "^1.0.17",

0 commit comments

Comments
 (0)