diff --git a/.circleci/config.yml b/.circleci/config.yml index 9ed8e86bc..c040aaa69 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,6 +9,9 @@ version: 2 # create pull request previews and to update `https://docs.ohif.org` ### +orbs: + codecov: codecov/codecov@1.0.5 + defaults: &defaults docker: - image: circleci/node:10.16.0 @@ -53,6 +56,11 @@ jobs: environment: JEST_JUNIT_OUTPUT: "reports/junit/js-test-results.xml" + - codecov/upload: + conf: "/home/circleci/repo/.codecov.yml" + file: "/home/circleci/repo/platform/viewer/coverage/lcov.info" + flags: "viewer" + # Store result - store_test_results: path: reports/junit diff --git a/.codecov.yml b/.codecov.yml index 692f4dcc4..99e156e84 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -7,8 +7,6 @@ coverage: status: project: - default: - threshold: 0.10% core: flags: core viewer: diff --git a/.vscode/settings.json b/.vscode/settings.json index 1b8e6b90e..50eed8343 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,30 +1,30 @@ { - "editor.rulers": [80, 120], - - // === - // Spacing - // === - - "editor.insertSpaces": true, - "editor.tabSize": 2, - "editor.trimAutoWhitespace": true, - "files.trimTrailingWhitespace": true, - "files.eol": "\n", - "files.insertFinalNewline": true, - "files.trimFinalNewlines": true, - - // === - // Event Triggers - // === - - "editor.formatOnSave": true, - "eslint.autoFixOnSave": true, - "eslint.run": "onSave", - "eslint.validate": [ - { "language": "javascript", "autoFix": true }, - { "language": "javascriptreact", "autoFix": true } - ], - "prettier.disableLanguages": [], - "prettier.endOfLine": "lf" - } - \ No newline at end of file + "editor.rulers": [80, 120], + + // === + // Spacing + // === + + "editor.insertSpaces": true, + "editor.tabSize": 2, + "editor.trimAutoWhitespace": true, + "files.trimTrailingWhitespace": true, + "files.eol": "\n", + "files.insertFinalNewline": true, + "files.trimFinalNewlines": true, + + // === + // Event Triggers + // === + + "editor.formatOnSave": true, + "eslint.autoFixOnSave": true, + "eslint.run": "onSave", + "eslint.validate": [ + { "language": "javascript", "autoFix": true }, + { "language": "javascriptreact", "autoFix": true } + ], + "prettier.disableLanguages": [], + "prettier.endOfLine": "lf", + "workbench.colorCustomizations": {} +} diff --git a/jest.config.base.js b/jest.config.base.js index fda185bae..4c3ea67af 100644 --- a/jest.config.base.js +++ b/jest.config.base.js @@ -17,7 +17,16 @@ module.exports = { // Setup // setupFiles: ["jest-canvas-mock/lib/index.js"], // Coverage - reporters: ["default", "jest-junit"], + reporters: [ + "default", + // Docs: https://www.npmjs.com/package/jest-junit + [ + "jest-junit", + { + addFileAttribute: true // CircleCI Only + } + ] + ], collectCoverage: false, collectCoverageFrom: [ "/src/**/*.{js,jsx}", diff --git a/package.json b/package.json index 80b064569..43bdc6ecb 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "build:package": "lerna run build:package --parallel", "test:ci": "", "test:unit": "jest --collectCoverage", - "test:unit:ci": "jest --ci --runInBand --collectCoverage && codecov", - "test:unit:ci:old": "lerna run test:unit:ci --parallel", + "test:unit:ci:old": "jest --ci --runInBand --collectCoverage && codecov", + "test:unit:ci": "lerna run test:unit:ci --parallel", "test:e2e": "", "test:e2e:ci": "lerna run lerna:test:e2e --parallel", "new-version": "lerna version --conventional-commits --yes",