Skip to content

Commit 7bf7788

Browse files
committed
chore: resolve package-lock.json conflict
2 parents 1b16ab4 + f25d849 commit 7bf7788

File tree

4 files changed

+12
-165
lines changed

4 files changed

+12
-165
lines changed

.changeset/tame-gifts-relax.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@asyncapi/cli": patch
3+
---
4+
5+
Bump @asyncapi/generator from v3.1.0 → v3.1.1

.github/workflows/upload-release-assets.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,19 +69,15 @@ jobs:
6969
if: matrix.container == ''
7070
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
7171
id: lockversion
72+
with:
73+
node-version: ${{ vars.NODE_VERSION }}
7274

7375
- name: Setup Node.js
7476
if: matrix.container == ''
75-
uses: actions/setup-node@v4
77+
uses: actions/setup-node@v6
7678
with:
7779
node-version: "${{ steps.lockversion.outputs.version }}"
78-
79-
- if: matrix.npm_script == 'pack:windows'
80-
name: install nodejs for windows
81-
uses: actions/setup-node@v4
82-
with:
83-
node-version: 20
84-
80+
8581
- name: Get version from package.json
8682
uses: actions/github-script@v6
8783
id: extractver

package-lock.json

Lines changed: 2 additions & 156 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"@asyncapi/bundler": "^0.6.4",
1717
"@asyncapi/converter": "^1.6.2",
1818
"@asyncapi/diff": "^0.5.0",
19-
"@asyncapi/generator": "^3.1.0",
19+
"@asyncapi/generator": "^3.1.1",
2020
"@asyncapi/modelina-cli": "^5.10.1",
2121
"@asyncapi/openapi-schema-parser": "^3.0.24",
2222
"@asyncapi/optimizer": "^1.0.4",

0 commit comments

Comments
 (0)