Skip to content

Commit 31d4f11

Browse files
committed
Merge branch 'develop'
2 parents 6498691 + 6383ad5 commit 31d4f11

File tree

5 files changed

+1892
-36
lines changed

5 files changed

+1892
-36
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ on:
1414
- '**'
1515
- '!master'
1616

17+
concurrency:
18+
group: ${{ github.workflow }}-${{ github.ref }}
19+
cancel-in-progress: true
20+
21+
1722
env:
1823
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1924
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -30,10 +35,6 @@ jobs:
3035

3136
steps:
3237
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
33-
- uses: styfle/[email protected]
34-
with:
35-
workflow_id: ci.yml
36-
access_token: ${{ github.token }}
3738

3839
- uses: actions/checkout@v4
3940
with:
@@ -58,5 +59,4 @@ jobs:
5859
- name: Release
5960
if: github.ref == 'refs/heads/develop'
6061
run: |
61-
npm i -g release-it @release-it/conventional-changelog @release-it/keep-a-changelog
6262
node release.mjs

.github/workflows/release.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ on:
99
branches:
1010
- 'master'
1111

12+
concurrency:
13+
group: ${{ github.workflow }}-${{ github.ref }}
14+
cancel-in-progress: true
15+
1216
env:
1317
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
1418
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -25,10 +29,6 @@ jobs:
2529

2630
steps:
2731
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
28-
- uses: styfle/[email protected]
29-
with:
30-
workflow_id: release.yml
31-
access_token: ${{ github.token }}
3232

3333
- uses: actions/checkout@v4
3434
with:
@@ -52,5 +52,4 @@ jobs:
5252
5353
- name: Release
5454
run: |
55-
npm i -g release-it @release-it/conventional-changelog @release-it/keep-a-changelog
5655
node release.mjs

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@
2929
## v1.2.8
3030
- Update dependencies
3131
- Release to npm
32+
33+
34+
## [Unreleased]

package.json

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -41,28 +41,19 @@
4141
"watch": "rm -rf lib && rollup -cw"
4242
},
4343
"dependencies": {
44-
"@types/bson": "^4.2.4",
45-
"@types/jest": "^29.5.14",
46-
"@types/node": "^22.13.1",
47-
"@types/shelljs": "^0.8.15",
4844
"bson": "^6.10.2",
49-
"jest": "^29.7.0",
50-
"libphonenumber-js": "^1.11.19",
51-
"prettier": "^3.5.0",
52-
"rollup": "^4.34.6",
53-
"rollup-plugin-typescript2": "^0.36.0",
54-
"shelljs": "^0.8.5",
55-
"ts-jest": "^29.2.5",
56-
"tslib": "^2.8.1",
57-
"typescript": "^5.7.3"
45+
"libphonenumber-js": "^1.11.19"
5846
},
5947
"devDependencies": {
48+
"@release-it/conventional-changelog": "^10.0.0",
49+
"@release-it/keep-a-changelog": "^6.0.0",
6050
"@types/bson": "^4.2.4",
6151
"@types/jest": "^29.5.14",
6252
"@types/node": "^22.13.1",
6353
"@types/shelljs": "^0.8.15",
6454
"jest": "^29.7.0",
6555
"prettier": "^3.5.0",
56+
"release-it": "^18.1.2",
6657
"rollup": "^4.34.6",
6758
"rollup-plugin-typescript2": "^0.36.0",
6859
"shelljs": "^0.8.5",

0 commit comments

Comments
 (0)