From 5dabd1f7116c64013e5bedbfd27d253db91469a8 Mon Sep 17 00:00:00 2001 From: Don Jayamanne Date: Mon, 12 Aug 2019 09:48:50 -0700 Subject: [PATCH] Use codecov for coverage reports --- CONTRIBUTING.md | 2 +- build/ci/codecov.yml | 27 +++++++++++++++++++ .../ci/templates/generate_upload_coverage.yml | 15 ----------- news/3 Code Health/6938.md | 1 + package-lock.json | 26 ------------------ package.json | 3 +-- 6 files changed, 30 insertions(+), 44 deletions(-) create mode 100644 build/ci/codecov.yml create mode 100644 news/3 Code Health/6938.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c80391626648..5cfc0ee77616 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -7,7 +7,7 @@ | `release` branch | `master` branch | Nightly CI | coverage (`master` branch) | |-|-|-|-| -| [![Build Status](https://dev.azure.com/ms/vscode-python/_apis/build/status/CI?branchName=release)](https://dev.azure.com/ms/vscode-python/_build/latest?definitionId=88&branchName=release) | [![Build Status](https://dev.azure.com/ms/vscode-python/_apis/build/status/CI?branchName=master)](https://dev.azure.com/ms/vscode-python/_build/latest?definitionId=88&branchName=master) | [![Build Status](https://dev.azure.com/ms/vscode-python/_apis/build/status/Nightly%20Build?branchName=master)](https://dev.azure.com/ms/vscode-python/_build/latest?definitionId=85&branchName=master) | [![Coverage Status](https://coveralls.io/repos/github/microsoft/vscode-python/badge.svg?branch=master)](https://coveralls.io/github/microsoft/vscode-python?branch=master) | +| [![Build Status](https://dev.azure.com/ms/vscode-python/_apis/build/status/CI?branchName=release)](https://dev.azure.com/ms/vscode-python/_build/latest?definitionId=88&branchName=release) | [![Build Status](https://dev.azure.com/ms/vscode-python/_apis/build/status/CI?branchName=master)](https://dev.azure.com/ms/vscode-python/_build/latest?definitionId=88&branchName=master) | [![Build Status](https://dev.azure.com/ms/vscode-python/_apis/build/status/Nightly%20Build?branchName=master)](https://dev.azure.com/ms/vscode-python/_build/latest?definitionId=85&branchName=master) | [![codecov](https://codecov.io/gh/microsoft/vscode-python/branch/master/graph/badge.svg)](https://codecov.io/gh/microsoft/vscode-python) | [[Development build](https://pvsc.blob.core.windows.net/extension-builds/ms-python-insiders.vsix)] diff --git a/build/ci/codecov.yml b/build/ci/codecov.yml new file mode 100644 index 000000000000..817313b270d3 --- /dev/null +++ b/build/ci/codecov.yml @@ -0,0 +1,27 @@ +codecov: + notify: + require_ci_to_pass: yes + +coverage: + precision: 0 + round: down + range: "70...100" + + status: + project: yes + patch: yes + changes: no + +parsers: + gcov: + branch_detection: + conditional: yes + loop: yes + method: no + macro: no + +comment: + branch: !release* + layout: "header, diff, files" + behavior: default + require_changes: no diff --git a/build/ci/templates/generate_upload_coverage.yml b/build/ci/templates/generate_upload_coverage.yml index 927e3206cda8..a0f2bfb98849 100644 --- a/build/ci/templates/generate_upload_coverage.yml +++ b/build/ci/templates/generate_upload_coverage.yml @@ -15,21 +15,6 @@ steps: summaryFileLocation: "$(System.DefaultWorkingDirectory)/coverage/cobertura-coverage.xml" reportDirectory: "$(System.DefaultWorkingDirectory)/coverage" - - bash: cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js - displayName: 'Upload coverage to coveralls' - continueOnError: true - condition: contains(variables['TestsToRun'], 'testUnitTests') - failOnStderr: false - # Set necessary env variables for coveralls, as they don't support Azure Devops. - # Set variables based on documentation and the coveralls (npm package) source code. 😊. - env: - COVERALLS_SERVICE_JOB_ID: $(Build.BuildId) - COVERALLS_REPO_TOKEN: $(COVERALLS_REPO_TOKEN) - COVERALLS_SERVICE_NAME: $(COVERALLS_SERVICE_NAME) - COVERALLS_GIT_COMMIT: $(Build.SourceVersion) - COVERALLS_GIT_BRANCH: $(Build.SourceBranchName) - CI_PULL_REQUEST: $(System.PullRequest.PullRequestNumber) - - bash: cat ./coverage/lcov.info | ./node_modules/.bin/codecov --pipe displayName: 'Upload coverage to codecov' continueOnError: true diff --git a/news/3 Code Health/6938.md b/news/3 Code Health/6938.md new file mode 100644 index 000000000000..db733330f20c --- /dev/null +++ b/news/3 Code Health/6938.md @@ -0,0 +1 @@ +Upload coverage reports to [codecov](https://codecov.io/gh/microsoft/vscode-python). diff --git a/package-lock.json b/package-lock.json index 71b1f11f9b84..b6b9cfb95603 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5404,20 +5404,6 @@ "parse-json": "^4.0.0" } }, - "coveralls": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.4.tgz", - "integrity": "sha512-eyqUWA/7RT0JagiL0tThVhjbIjoiEUyWCjtUJoOPcWoeofP5WK/jb2OJYoBFrR6DvplR+AxOyuBqk4JHkk5ykA==", - "dev": true, - "requires": { - "growl": "~> 1.10.0", - "js-yaml": "^3.11.0", - "lcov-parse": "^0.0.10", - "log-driver": "^1.2.7", - "minimist": "^1.2.0", - "request": "^2.86.0" - } - }, "cp-file": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz", @@ -11438,12 +11424,6 @@ "invert-kv": "^1.0.0" } }, - "lcov-parse": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz", - "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=", - "dev": true - }, "lead": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz", @@ -11803,12 +11783,6 @@ "integrity": "sha1-SLtQiECfFvGCFmZkHETdGqrjzYg=", "dev": true }, - "log-driver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", - "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", - "dev": true - }, "log-symbols": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", diff --git a/package.json b/package.json index 6374896c570b..c022da8be5d3 100644 --- a/package.json +++ b/package.json @@ -2545,8 +2545,8 @@ "@types/glob": "^5.0.35", "@types/html-webpack-plugin": "^3.2.0", "@types/iconv-lite": "^0.0.1", - "@types/jsdom": "^11.12.0", "@types/jquery": "^1.10.35", + "@types/jsdom": "^11.12.0", "@types/loader-utils": "^1.1.3", "@types/lodash": "^4.14.104", "@types/md5": "^2.1.32", @@ -2592,7 +2592,6 @@ "codecov": "^3.5.0", "colors": "^1.2.1", "copy-webpack-plugin": "^4.6.0", - "coveralls": "^3.0.4", "cross-spawn": "^6.0.5", "css-loader": "^1.0.1", "cucumber-html-reporter": "^4.0.5",