Skip to content

Commit 19f4b3a

Browse files
authored
Merge branch 'master' into fix-missing-css-and-js-files
2 parents fcbf823 + 9f76e81 commit 19f4b3a

File tree

12 files changed

+308
-232
lines changed

12 files changed

+308
-232
lines changed

.github/workflows/if-nodejs-pr-testing.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@ jobs:
4949
run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
5050
shell: bash
5151
- if: steps.packagejson.outputs.exists == 'true'
52-
name: Check package-lock version
52+
name: Determine what node version to use
5353
# This workflow is from our own org repo and safe to reference by 'master'.
5454
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master # //NOSONAR
55+
with:
56+
node-version: ${{ vars.NODE_VERSION }}
5557
id: lockversion
5658
- if: steps.packagejson.outputs.exists == 'true'
5759
name: Setup Node.js

.github/workflows/if-nodejs-release.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@ on:
1717
- alpha
1818
- next
1919

20+
permissions:
21+
contents: write # to be able to publish a GitHub release
22+
issues: write # to be able to comment on released issues
23+
pull-requests: write # to be able to comment on released pull requests
24+
id-token: write # to enable use of OIDC for trusted publishing and npm provenance
25+
2026
jobs:
2127

2228
test-nodejs:
@@ -47,9 +53,11 @@ jobs:
4753
run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
4854
shell: bash
4955
- if: steps.packagejson.outputs.exists == 'true'
50-
name: Check package-lock version
56+
name: Determine what node version to use
5157
# This workflow is from our own org repo and safe to reference by 'master'.
5258
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master # //NOSONAR
59+
with:
60+
node-version: ${{ vars.NODE_VERSION }}
5361
id: lockversion
5462
- if: steps.packagejson.outputs.exists == 'true'
5563
name: Setup Node.js
@@ -94,35 +102,37 @@ jobs:
94102
run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
95103
shell: bash
96104
- if: steps.packagejson.outputs.exists == 'true'
97-
name: Check package-lock version
105+
name: Determine what node version to use
98106
# This workflow is from our own org repo and safe to reference by 'master'.
99107
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master # //NOSONAR
108+
with:
109+
node-version: ${{ vars.NODE_VERSION }}
100110
id: lockversion
101111
- if: steps.packagejson.outputs.exists == 'true'
102112
name: Setup Node.js
103113
uses: actions/setup-node@v4
104114
with:
105115
node-version: "${{ steps.lockversion.outputs.version }}"
116+
registry-url: "https://registry.npmjs.org"
106117
- if: steps.packagejson.outputs.exists == 'true'
107118
name: Install dependencies
108119
shell: bash
109120
run: npm ci
110121
- if: steps.packagejson.outputs.exists == 'true'
111122
name: Add plugin for conventional commits for semantic-release
112-
run: npm install --save-dev conventional-changelog-conventionalcommits@5.0.0
123+
run: npm install --save-dev conventional-changelog-conventionalcommits@9.1.0
113124
- if: steps.packagejson.outputs.exists == 'true'
114125
name: Publish to any of NPM, Github, and Docker Hub
115126
id: release
116127
env:
117128
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
118-
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
119129
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
120130
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
121131
GIT_AUTHOR_NAME: asyncapi-bot
122132
GIT_AUTHOR_EMAIL: info@asyncapi.io
123133
GIT_COMMITTER_NAME: asyncapi-bot
124134
GIT_COMMITTER_EMAIL: info@asyncapi.io
125-
run: npx semantic-release@19.0.4
135+
run: npx semantic-release@25.0.2
126136
- if: failure() # Only, on failure, send a message on the 94_bot-failing-ci slack channel
127137
name: Report workflow run status to Slack
128138
uses: 8398a7/action-slack@28ba43ae48961b90635b50953d216767a6bea486 #using https://github.com/8398a7/action-slack/releases/tag/v3.16.2

.github/workflows/if-nodejs-version-bump.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,11 @@ jobs:
2525
id: packagejson
2626
run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
2727
- if: steps.packagejson.outputs.exists == 'true'
28-
name: Check package-lock version
28+
name: Determine what node version to use
2929
# This workflow is from our own org repo and safe to reference by 'master'.
3030
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master # //NOSONAR
31+
with:
32+
node-version: ${{ vars.NODE_VERSION }}
3133
id: lockversion
3234
- if: steps.packagejson.outputs.exists == 'true'
3335
name: Setup Node.js

.github/workflows/scripts/mailchimp/package-lock.json

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

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ asyncapi generate fromTemplate <asyncapi.yaml> @asyncapi/html-template@2.3.14
4444
asyncapi generate fromTemplate <asyncapi.yaml> @asyncapi/html-template@3.0.0 --use-new-generator
4545
```
4646

47+
> If you use template version v3.5 with AsyncAPI Generator v3 and AsyncAPI CLI v5
48+
49+
```bash
50+
asyncapi generate fromTemplate <asyncapi.yaml> @asyncapi/html-template@3.5.0
51+
```
52+
4753
You can replace `<asyncapi.yaml>` with local path or URL pointing to [any AsyncAPI document](https://raw.githubusercontent.com/asyncapi/spec/refs/heads/master/examples/streetlights-kafka-asyncapi.yml).
4854
Look into [Releases](/asyncapi/html-template/releases) of this template to pick up the version you need. It is not recommended to always use the latest in production. Always use a specific version.
4955

hooks/99_generatePdf.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@ module.exports = {
1616
try {
1717
const browser = await puppeteer.launch({args: ['--no-sandbox', '--disable-setuid-sandbox']});
1818
const page = await browser.newPage();
19-
19+
const fullPath = path.resolve(targetDir, 'index.html');
20+
const fileUrl = `file:///${fullPath.replaceAll('\\', '/')}`;
2021
// Go to prepared page with documentation
21-
await page.goto(`file://${path.join(targetDir, 'index.html')}`, { waitUntil: 'networkidle0' });
22+
await page.goto(fileUrl, { waitUntil: 'networkidle0' });
2223

2324
// Hide burger-menu in pdf
2425
await page.evaluate(() => { document.querySelector('.burger-menu').style.display = 'none'; });

0 commit comments

Comments
 (0)