Skip to content

Commit

Permalink
Merge branch 'main' into zeptomail
Browse files Browse the repository at this point in the history
  • Loading branch information
mtrezza authored Oct 18, 2024
2 parents dfaad60 + 9af92ae commit d70dd59
Show file tree
Hide file tree
Showing 7 changed files with 108 additions and 164 deletions.
11 changes: 10 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,4 +80,13 @@ jobs:
- run: npm test
env:
CI: true
- run: bash <(curl -s https://codecov.io/bash)
- name: Upload code coverage
uses: codecov/codecov-action@v4
with:
fail_ci_if_error: false
token: ${{ secrets.CODECOV_TOKEN }}
env:
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true
2 changes: 1 addition & 1 deletion .github/workflows/release-automated.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: release-automated
on:
push:
branches: [ release, alpha, beta, next-major, 'release-[0-9]+.x.x' ]
branches: [ main, master, release, alpha, beta, next-major, 'release-[0-9]+.x.x' ]
jobs:
release:
runs-on: ubuntu-latest
Expand Down
10 changes: 10 additions & 0 deletions .nycrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"reporter": [
"lcov",
"text-summary"
],
"exclude": [
"**/spec/**"
]
}

166 changes: 41 additions & 125 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,14 @@
"@semantic-release/git": "10.0.1",
"@semantic-release/npm": "10.0.3",
"@semantic-release/release-notes-generator": "11.0.1",
"@types/jasmine": "5.1.4",
"@types/node": "22.7.6",
"babel-eslint": "10.1.0",
"codecov": "3.8.3",
"eslint": "7.32.0",
"eslint-plugin-flowtype": "5.9.0",
"form-data": "4.0.0",
"jasmine": "3.9.0",
"jasmine-spec-reporter": "7.0.0",
"madge": "5.0.1",
"mailgun.js": "3.5.9",
"nyc": "15.1.0",
Expand All @@ -63,8 +65,7 @@
"lint:fix": "eslint '{src,spec,demo}/**/*.js' --fix",
"madge": "node_modules/.bin/madge ./src $npm_config_arg",
"madge:circular": "npm run madge --arg=--circular",
"test": "nyc --reporter=lcov jasmine",
"posttest": "nyc report --reporter=json && codecov -f coverage/*.json",
"test": "nyc jasmine",
"prepare": "npm run build && npm test",
"demo": "node ./demo"
}
Expand Down
Loading

0 comments on commit d70dd59

Please sign in to comment.