Merge branch 'master' into v2

This commit is contained in:
Tom Hu 2021-07-07 17:38:23 -07:00
commit 112e1a0afd
No known key found for this signature in database
GPG key ID: F7E832BD316D5603
2 changed files with 2 additions and 2 deletions

View file

@ -11,7 +11,7 @@ jobs:
- name: Lint - name: Lint
run: npm run lint run: npm run lint
- name: Run tests and collect coverage - name: Run tests and collect coverage
run: yarn run test run: npm run test
- name: Upload coverage to Codecov (demo) - name: Upload coverage to Codecov (demo)
uses: ./ uses: ./
with: with:

View file

@ -5,7 +5,7 @@
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"lint": "eslint src/*.*", "lint": "eslint src/*.*",
"test": "yarn run test-script && yarn run test-calculator && yarn run test-coverage", "test": "npm run test-script && npm run test-calculator && npm run test-coverage",
"test-calculator": "jest --testPathPattern=demo/calculator/ --coverage --coverageDirectory=coverage/calculator", "test-calculator": "jest --testPathPattern=demo/calculator/ --coverage --coverageDirectory=coverage/calculator",
"test-coverage": "jest --testPathPattern=demo/coverage-test/ --coverage --coverageDirectory=coverage/coverage-test", "test-coverage": "jest --testPathPattern=demo/coverage-test/ --coverage --coverageDirectory=coverage/coverage-test",
"test-script": "jest --testPathPattern=src/ --coverage --coverageDirectory=coverage/script", "test-script": "jest --testPathPattern=src/ --coverage --coverageDirectory=coverage/script",