不要怂,就是干,撸起袖子干!

Commit fd4091fb by Jan Aagaard Meier Committed by GitHub

Merge pull request #6545 from sequelize/coverage

chore(ci): Switch from coveralls to codecov
2 parents 2e421712 7e699678
...@@ -14,8 +14,6 @@ env: ...@@ -14,8 +14,6 @@ env:
- CC=clang - CC=clang
- CXX=clang++ - CXX=clang++
- npm_config_clang=1 - npm_config_clang=1
- COVERALLS_REPO_TOKEN=751SiA6QhY5EH4P2ygq7JFWulqiD2ETXO
- COVERALLS_PARALLEL=true
matrix: matrix:
- DIALECT=mysql - DIALECT=mysql
- DIALECT=postgres - DIALECT=postgres
...@@ -40,7 +38,7 @@ before_script: ...@@ -40,7 +38,7 @@ before_script:
- "psql sequelize_test -c 'create extension postgis;' -U postgres" - "psql sequelize_test -c 'create extension postgis;' -U postgres"
script: script:
- "if [ $COVERAGE ]; then npm run coveralls; else npm run test; fi" - "if [ $COVERAGE ]; then npm run cover && bash <(curl -s https://codecov.io/bash) -f coverage/lcov.info; else npm run test; fi"
matrix: matrix:
include: include:
...@@ -53,5 +51,3 @@ matrix: ...@@ -53,5 +51,3 @@ matrix:
- node_js: "6" - node_js: "6"
env: COVERAGE=true DIALECT=sqlite env: COVERAGE=true DIALECT=sqlite
notifications:
webhooks: https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
[![Build Status](https://travis-ci.org/sequelize/sequelize.svg?branch=master)](https://travis-ci.org/sequelize/sequelize) [![Build Status](https://travis-ci.org/sequelize/sequelize.svg?branch=master)](https://travis-ci.org/sequelize/sequelize)
[![Windows Build status](https://ci.appveyor.com/api/projects/status/8xhttm9pxmbmtbwb/branch/master?svg=true)](https://ci.appveyor.com/project/felixfbecker/sequelize/branch/master) [![Windows Build status](https://ci.appveyor.com/api/projects/status/8xhttm9pxmbmtbwb/branch/master?svg=true)](https://ci.appveyor.com/project/felixfbecker/sequelize/branch/master)
[![Coverage Status](https://coveralls.io/repos/github/sequelize/sequelize/badge.svg?branch=master)](https://coveralls.io/github/sequelize/sequelize?branch=master) [![codecov](https://codecov.io/gh/sequelize/sequelize/branch/master/graph/badge.svg)](https://codecov.io/gh/sequelize/sequelize)
[![Bountysource](https://www.bountysource.com/badge/team?team_id=955&style=bounties_received)](https://www.bountysource.com/teams/sequelize/issues?utm_source=Sequelize&utm_medium=shield&utm_campaign=bounties_received) [![Bountysource](https://www.bountysource.com/badge/team?team_id=955&style=bounties_received)](https://www.bountysource.com/teams/sequelize/issues?utm_source=Sequelize&utm_medium=shield&utm_campaign=bounties_received)
[![Slack Status](http://sequelize-slack.herokuapp.com/badge.svg)](http://sequelize.slack.com) [![Slack Status](http://sequelize-slack.herokuapp.com/badge.svg)](http://sequelize.slack.com)
[![npm](https://img.shields.io/npm/dm/sequelize.svg?maxAge=2592000)](https://www.npmjs.com/package/sequelize) [![npm](https://img.shields.io/npm/dm/sequelize.svg?maxAge=2592000)](https://www.npmjs.com/package/sequelize)
......
...@@ -12,9 +12,6 @@ cache: ...@@ -12,9 +12,6 @@ cache:
- node_modules - node_modules
environment: environment:
global:
COVERALLS_REPO_TOKEN: 751SiA6QhY5EH4P2ygq7JFWulqiD2ETXO
COVERALLS_PARALLEL: true
matrix: matrix:
- {NODE_VERSION: 4, DIALECT: mssql} - {NODE_VERSION: 4, DIALECT: mssql}
- {NODE_VERSION: 6.3, DIALECT: mssql, COVERAGE: true} - {NODE_VERSION: 6.3, DIALECT: mssql, COVERAGE: true}
...@@ -34,10 +31,12 @@ before_test: ...@@ -34,10 +31,12 @@ before_test:
- ps: . .\appveyor-setup.ps1 - ps: . .\appveyor-setup.ps1
test_script: test_script:
- 'IF "%COVERAGE%" == "true" (npm run coveralls) ELSE (npm test)' - 'IF "%COVERAGE%" == "true" (npm run cover) ELSE (npm test)'
notifications: after_test:
- provider: Webhook - ps: $env:PATH = 'C:\Program Files\Git\usr\bin;' + $env:PATH
url: https://coveralls.io/webhook?repo_token=751SiA6QhY5EH4P2ygq7JFWulqiD2ETXO - ps: |
on_build_success: true if (Test-Path env:\COVERAGE) {
on_build_failure: true Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
bash codecov.sh -f "coverage\lcov.info"
}
comment:
layout: "header, changes"
behavior: default
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
"chai-spies": "^0.7.0", "chai-spies": "^0.7.0",
"commander": "^2.6.0", "commander": "^2.6.0",
"continuation-local-storage": "^3.1.4", "continuation-local-storage": "^3.1.4",
"coveralls": "^2.11.9",
"cross-env": "^2.0.1", "cross-env": "^2.0.1",
"dox": "~0.9.0", "dox": "~0.9.0",
"eslint": "^3.1.0", "eslint": "^3.1.0",
...@@ -130,7 +129,6 @@ ...@@ -130,7 +129,6 @@
"cover-integration": "cross-env COVERAGE=true node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -t 60000 --ui tdd \"test/integration/**/*.test.js\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/integration.info')\"", "cover-integration": "cross-env COVERAGE=true node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -t 60000 --ui tdd \"test/integration/**/*.test.js\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/integration.info')\"",
"cover-unit": "cross-env COVERAGE=true node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -t 30000 --ui tdd \"test/unit/**/*.test.js\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/unit.info')\"", "cover-unit": "cross-env COVERAGE=true node_modules/.bin/istanbul cover ./node_modules/mocha/bin/_mocha --report lcovonly -- -t 30000 --ui tdd \"test/unit/**/*.test.js\" && node -e \"require('fs').renameSync('coverage/lcov.info', 'coverage/unit.info')\"",
"merge-coverage": "lcov-result-merger \"coverage/*.info\" \"coverage/lcov.info\"", "merge-coverage": "lcov-result-merger \"coverage/*.info\" \"coverage/lcov.info\"",
"coveralls": "npm run cover && cat ./coverage/lcov.info | node ./node_modules/coveralls/bin/coveralls.js && rimraf ./coverage",
"sscce": "docker-compose run sequelize /bin/sh -c \"node sscce.js\"", "sscce": "docker-compose run sequelize /bin/sh -c \"node sscce.js\"",
"sscce-mysql": "cross-env DIALECT=mysql npm run sscce", "sscce-mysql": "cross-env DIALECT=mysql npm run sscce",
"sscce-postgres": "cross-env DIALECT=postgres npm run sscce", "sscce-postgres": "cross-env DIALECT=postgres npm run sscce",
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!