Skip to content

Commit

Permalink
Merge pull request #430 from alexindigo/master
Browse files Browse the repository at this point in the history
Switched windows tests from AppVeyor to Travis
  • Loading branch information
alexindigo committed Jun 25, 2019
2 parents 0fb2f57 + 508b626 commit 2721ad7
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 28 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Expand Up @@ -11,6 +11,7 @@ node_js:
os:
- osx
- linux
- windows

install:
- travis_retry npm install
Expand All @@ -19,8 +20,8 @@ script:
- uname -a
- node --version
- npm --version
- npm run ci-lint
- npm run ci-test
- if [ "$TRAVIS_OS_NAME" != "windows" ]; then npm run ci-lint; fi
- if [ "$TRAVIS_OS_NAME" = "windows" ]; then npm run test; else npm run ci-test; fi
- npm run check

after_success:
Expand Down
2 changes: 1 addition & 1 deletion Readme.md
Expand Up @@ -8,7 +8,7 @@ The API of this library is inspired by the [XMLHttpRequest-2 FormData Interface]

[![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)
[![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)
[![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)
[![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)

[![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)
[![Dependency Status](https://img.shields.io/david/form-data/form-data.svg)](https://david-dm.org/form-data/form-data)
Expand Down
22 changes: 0 additions & 22 deletions appveyor.yml

This file was deleted.

6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -16,7 +16,7 @@
"posttest": "istanbul report lcov text",
"lint": "eslint lib/*.js test/*.js test/integration/*.js",
"report": "istanbul report lcov text",
"ci-lint": "is-node-modern 6 && npm run lint || is-node-not-modern 6",
"ci-lint": "is-node-modern 8 && npm run lint || is-node-not-modern 8",
"ci-test": "npm run test && npm run browser && npm run report",
"predebug": "rimraf coverage test/tmp",
"debug": "verbose=1 ./test/run.js",
Expand Down Expand Up @@ -46,9 +46,9 @@
"devDependencies": {
"browserify": "^13.1.1",
"browserify-istanbul": "^2.0.0",
"coveralls": "^2.11.14",
"coveralls": "^3.0.4",
"cross-spawn": "^4.0.2",
"eslint": "^3.9.1",
"eslint": "^6.0.1",
"fake": "^0.2.2",
"far": "^0.0.7",
"formidable": "^1.0.17",
Expand Down

0 comments on commit 2721ad7

Please sign in to comment.