From 72070d40ccc2032e6d480bd1d3c095830204050b Mon Sep 17 00:00:00 2001 From: Rongrong Date: Sat, 30 Apr 2022 07:37:23 +0800 Subject: [PATCH] chore(*): fix code coverage not uploaded (#9661) Signed-off-by: Rongrong --- .github/workflows/test.yml | 7 ++++--- README.md | 1 + docs/README.md | 1 + docs/en/README.md | 1 + package.json | 11 +++++++---- 5 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 168cb0d3b2..34c44add3c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -25,13 +25,14 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'yarn' - run: yarn - - run: npm run jest + - run: npm run jest:coverage env: REDIS_URL: redis://localhost:${{ job.services.redis.ports[6379] }}/ - name: Upload coverage to Codecov + if: ${{ matrix.node-version == '16' }} uses: codecov/codecov-action@v3 - with: - token: ${{ secrets.CODECOV_TOKEN }} + # with: + # token: ${{ secrets.CODECOV_TOKEN }} # not required for public repos docs: runs-on: ubuntu-latest diff --git a/README.md b/README.md index a61b35b4aa..23edc6fd1d 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ [![npm publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/publish/master?label=npm%20publish&logo=npm&style=flat-square)](https://www.npmjs.com/package/rsshub) [![docker publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/%5Bdocker%5D%20CI%20for%20releases/master?label=docker%20publish&logo=docker&style=flat-square)](https://hub.docker.com/r/diygod/rsshub) [![test](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/test/master?label=test&logo=github&style=flat-square)](https://github.com/DIYgod/RSSHub/actions/workflows/test.yml?query=event%3Apush+branch%3Amaster) +[![Test coverage](https://img.shields.io/codecov/c/github/DIYgod/RSSHub.svg?style=flat-square&logo=codecov)](https://codecov.io/github/DIYgod/RSSHub?branch=master) ## Introduction diff --git a/docs/README.md b/docs/README.md index 2dffe2854b..23baec1532 100644 --- a/docs/README.md +++ b/docs/README.md @@ -15,6 +15,7 @@ sidebarDepth: 0 [![npm publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/publish/master?label=npm%20publish\&logo=npm\&style=flat-square)](https://www.npmjs.com/package/rsshub) [![docker publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/%5Bdocker%5D%20CI%20for%20releases/master?label=docker%20publish\&logo=docker\&style=flat-square)](https://hub.docker.com/r/diygod/rsshub) [![test](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/test/master?label=test\&logo=github\&style=flat-square)](https://github.com/DIYgod/RSSHub/actions/workflows/test.yml?query=event%3Apush+branch%3Amaster) +[![Test coverage](https://img.shields.io/codecov/c/github/DIYgod/RSSHub.svg?style=flat-square\&logo=codecov)](https://codecov.io/github/DIYgod/RSSHub?branch=master) RSSHub 是一个开源、简单易用、易于扩展的 RSS 生成器,可以给任何奇奇怪怪的内容生成 RSS 订阅源。RSSHub 借助于开源社区的力量快速发展中,目前已适配数百家网站的上千项内容 diff --git a/docs/en/README.md b/docs/en/README.md index ab1e81ee42..0078b7409d 100644 --- a/docs/en/README.md +++ b/docs/en/README.md @@ -15,6 +15,7 @@ sidebarDepth: 0 [![npm publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/publish/master?label=npm%20publish&logo=npm&style=flat-square)](https://www.npmjs.com/package/rsshub) [![docker publish](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/%5Bdocker%5D%20CI%20for%20releases/master?label=docker%20publish&logo=docker&style=flat-square)](https://hub.docker.com/r/diygod/rsshub) [![test](https://img.shields.io/github/workflow/status/DIYgod/RSSHub/test/master?label=test&logo=github&style=flat-square)](https://github.com/DIYgod/RSSHub/actions/workflows/test.yml?query=event%3Apush+branch%3Amaster) +[![Test coverage](https://img.shields.io/codecov/c/github/DIYgod/RSSHub.svg?style=flat-square&logo=codecov)](https://codecov.io/github/DIYgod/RSSHub?branch=master) RSSHub is an open source, easy to use, and extensible RSS feed aggregator, it's capable of generating RSS feeds from pretty much everything. diff --git a/package.json b/package.json index 027a918d25..f937d8dd32 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,10 @@ "format": "eslint \"**/*.{js,yml}\" --fix && node docs/.format/format.js && prettier \"**/*.{js,json}\" --write", "format:staged": "eslint \"**/*.{js,yml}\" --fix && node docs/.format/format.js --staged && pretty-quick --staged --verbose --pattern \"**/*.{js,json}\"", "format:check": "eslint \"**/*.{js,yml}\" && prettier-check \"**/*.{js,json}\"", - "test": "npm run format:check && cross-env NODE_ENV=test jest --coverage --runInBand --forceExit", - "jest": "cross-env NODE_ENV=test jest --runInBand --forceExit", - "jest:watch": "cross-env NODE_ENV=test jest --watch" + "jest": "cross-env NODE_ENV=test jest --runInBand --forceExit --detectOpenHandles", + "jest:coverage": "cross-env NODE_ENV=test jest --coverage --runInBand --forceExit --detectOpenHandles", + "jest:watch": "cross-env NODE_ENV=test jest --watch", + "test": "npm run format:check && npm run jest:coverage" }, "repository": { "type": "git", @@ -148,7 +149,9 @@ ], "collectCoverageFrom": [ "lib/**/*.js", - "!lib/routes/**/*.js" + "!lib/routes/**/*.js", + "!lib/v2/**/*.js", + "!lib/radar-rules.js" ], "bail": true, "testEnvironment": "node",