Skip to content

Commit f4361d4

Browse files
derbergderberg
authored
Merge branch 'master' into release/3.1.0
2 parents 492695e + 094a703 commit f4361d4

22 files changed

+372
-148
lines changed

‎.github/workflows/automerge-for-humans-add-ready-to-merge-or-do-not-merge-label.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ jobs:
2727
steps:
2828
- name: Add ready-to-merge label
2929
uses: actions/github-script@v7
30+
env:
31+
GITHUB_ACTOR: ${{ github.actor }}
3032
with:
3133
github-token: ${{ secrets.GH_TOKEN }}
3234
script: |
@@ -56,7 +58,7 @@ jobs:
5658
issue_number: context.issue.number,
5759
owner: context.repo.owner,
5860
repo: context.repo.repo,
59-
body: `Hello, @${{ github.actor }}! 👋🏼
61+
body: `Hello, @${process.env.GITHUB_ACTOR}! 👋🏼
6062
This PR is not up to date with the base branch and can't be merged.
6163
Please update your branch manually with the latest version of the base branch.
6264
PRO-TIP: To request an update from the upstream branch, simply comment \`/u\` or \`/update\` and our bot will handle the update operation promptly.

‎.github/workflows/automerge-orphans.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ jobs:
5252
}
5353
- if: steps.orphans.outputs.found == 'true'
5454
name: Convert markdown to slack markdown
55-
uses: asyncapi/.github/.github/actions/slackify-markdown@master
55+
# This workflow is from our own org repo and safe to reference by 'master'.
56+
uses: asyncapi/.github/.github/actions/slackify-markdown@master # //NOSONAR
5657
id: issuemarkdown
5758
with:
5859
markdown: "-> [${{steps.orphans.outputs.title}}](${{steps.orphans.outputs.url}})"

‎.github/workflows/bounty-program-commands.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@ jobs:
3333
steps:
3434
- name: ❌ @${{github.actor}} made an unauthorized attempt to use a Bounty Program's command
3535
uses: actions/github-script@v7
36+
env:
37+
ACTOR: ${{ github.actor }}
3638
with:
3739
github-token: ${{ secrets.GH_TOKEN }}
3840
script: |
39-
const commentText = `❌ @${{github.actor}} is not authorized to use the Bounty Program's commands.
41+
const commentText = `❌ @${process.env.ACTOR} is not authorized to use the Bounty Program's commands.
4042
These commands can only be used by members of the [Bounty Team](https://github.com/orgs/asyncapi/teams/bounty_team).`;
4143
42-
console.log(`❌ @${{github.actor}} made an unauthorized attempt to use a Bounty Program's command.`);
44+
console.log(`❌ @${process.env.ACTOR} made an unauthorized attempt to use a Bounty Program's command.`);
4345
github.rest.issues.createComment({
4446
issue_number: context.issue.number,
4547
owner: context.repo.owner,

‎.github/workflows/bump.yml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,17 @@ jobs:
2424
- name: Check if Node.js project and has package.json
2525
id: packagejson
2626
run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
27+
- name: Setup corepack with pnpm and yarn
28+
if: steps.packagejson.outputs.exists == 'true'
29+
run: corepack enable
2730
- if: steps.packagejson.outputs.exists == 'true'
2831
name: Bumping latest version of this package in other repositories
29-
uses: derberg/npm-dependency-manager-for-your-github-org@1eafd3bf3974f21d395c1abac855cb04b295d570 # using v6.-.- https://github.com/derberg/npm-dependency-manager-for-your-github-org/releases/tag/v6
32+
uses: derberg/npm-dependency-manager-for-your-github-org@f95b99236e8382a210042d8cfb84f42584e29c24 # using v6.2.0.-.- https://github.com/derberg/npm-dependency-manager-for-your-github-org/releases/tag/v6.2.0
3033
with:
3134
github_token: ${{ secrets.GH_TOKEN }}
3235
committer_username: asyncapi-bot
3336
committer_email: info@asyncapi.io
3437
repos_to_ignore: spec,bindings,saunter,server-api
3538
custom_id: "dependency update from asyncapi bot"
39+
search: "true"
40+
ignore_paths: .github/workflows

‎.github/workflows/help-command.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ jobs:
1515
steps:
1616
- name: Add comment to PR
1717
uses: actions/github-script@v7
18+
env:
19+
ACTOR: ${{ github.actor }}
1820
with:
1921
github-token: ${{ secrets.GH_TOKEN }}
2022
script: |
@@ -25,7 +27,7 @@ jobs:
2527
issue_number: context.issue.number,
2628
owner: context.repo.owner,
2729
repo: context.repo.repo,
28-
body: `Hello, @${{ github.actor }}! 👋🏼
30+
body: `Hello, @${process.env.ACTOR}! 👋🏼
2931
3032
I'm 🧞🧞🧞 Genie 🧞🧞🧞 from the magic lamp. Looks like somebody needs a hand!
3133
@@ -44,14 +46,16 @@ jobs:
4446
steps:
4547
- name: Add comment to Issue
4648
uses: actions/github-script@v7
49+
env:
50+
ACTOR: ${{ github.actor }}
4751
with:
4852
github-token: ${{ secrets.GH_TOKEN }}
4953
script: |
5054
github.rest.issues.createComment({
5155
issue_number: context.issue.number,
5256
owner: context.repo.owner,
5357
repo: context.repo.repo,
54-
body: `Hello, @${{ github.actor }}! 👋🏼
58+
body: `Hello, @${process.env.ACTOR}! 👋🏼
5559
5660
I'm 🧞🧞🧞 Genie 🧞🧞🧞 from the magic lamp. Looks like somebody needs a hand!
5761

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ jobs:
1414
runs-on: ${{ matrix.os }}
1515
strategy:
1616
matrix:
17-
# Using macos-13 instead of latest (macos-14) due to an issue with Puppeteer and such runner.
18-
# See: https://github.com/puppeteer/puppeteer/issues/12327 and https://github.com/asyncapi/parser-js/issues/1001
19-
os: [ubuntu-latest, macos-13, windows-latest]
17+
os: [ubuntu-latest, macos-latest, windows-latest]
2018
steps:
2119
- if: >
2220
!github.event.pull_request.draft && !(
@@ -51,8 +49,11 @@ jobs:
5149
run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
5250
shell: bash
5351
- if: steps.packagejson.outputs.exists == 'true'
54-
name: Check package-lock version
55-
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
52+
name: Determine what node version to use
53+
# This workflow is from our own org repo and safe to reference by 'master'.
54+
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master # //NOSONAR
55+
with:
56+
node-version: ${{ vars.NODE_VERSION }}
5657
id: lockversion
5758
- if: steps.packagejson.outputs.exists == 'true'
5859
name: Setup Node.js

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

Lines changed: 20 additions & 10 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:
@@ -33,9 +39,7 @@ jobs:
3339
runs-on: ${{ matrix.os }}
3440
strategy:
3541
matrix:
36-
# Using macos-13 instead of latest (macos-14) due to an issue with Puppeteer and such runner.
37-
# See: https://github.com/puppeteer/puppeteer/issues/12327 and https://github.com/asyncapi/parser-js/issues/1001
38-
os: [ubuntu-latest, macos-13, windows-latest]
42+
os: [ubuntu-latest, macos-latest, windows-latest]
3943
steps:
4044
- name: Set git to use LF #to once and for all finish neverending fight between Unix and Windows
4145
run: |
@@ -49,8 +53,11 @@ jobs:
4953
run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
5054
shell: bash
5155
- if: steps.packagejson.outputs.exists == 'true'
52-
name: Check package-lock version
53-
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
56+
name: Determine what node version to use
57+
# This workflow is from our own org repo and safe to reference by 'master'.
58+
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master # //NOSONAR
59+
with:
60+
node-version: ${{ vars.NODE_VERSION }}
5461
id: lockversion
5562
- if: steps.packagejson.outputs.exists == 'true'
5663
name: Setup Node.js
@@ -95,34 +102,37 @@ jobs:
95102
run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
96103
shell: bash
97104
- if: steps.packagejson.outputs.exists == 'true'
98-
name: Check package-lock version
99-
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
105+
name: Determine what node version to use
106+
# This workflow is from our own org repo and safe to reference by 'master'.
107+
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: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +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
29-
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
28+
name: Determine what node version to use
29+
# This workflow is from our own org repo and safe to reference by 'master'.
30+
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master # //NOSONAR
31+
with:
32+
node-version: ${{ vars.NODE_VERSION }}
3033
id: lockversion
3134
- if: steps.packagejson.outputs.exists == 'true'
3235
name: Setup Node.js
@@ -46,18 +49,23 @@ jobs:
4649
# There is no need to substract "v" from the tag as version script handles it
4750
# When adding "bump:version" script in package.json, make sure no tags are added by default (--no-git-tag-version) as they are already added by release workflow
4851
# When adding "bump:version" script in package.json, make sure --allow-same-version is set in case someone forgot and updated package.json manually and we want to avoide this action to fail and raise confusion
49-
run: VERSION=${{github.event.release.tag_name}} npm run bump:version
52+
env:
53+
VERSION: ${{github.event.release.tag_name}}
54+
run: npm run bump:version
5055
- if: steps.packagejson.outputs.exists == 'true'
5156
name: Create Pull Request with updated asset files including package.json
5257
uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # use 4.2.4 https://github.com/peter-evans/create-pull-request/releases/tag/v4.2.4
58+
env:
59+
RELEASE_TAG: ${{github.event.release.tag_name}}
60+
RELEASE_URL: ${{github.event.release.html_url}}
5361
with:
5462
token: ${{ secrets.GH_TOKEN }}
55-
commit-message: 'chore(release): ${{github.event.release.tag_name}}'
63+
commit-message: 'chore(release): ${{ env.RELEASE_TAG }}'
5664
committer: asyncapi-bot <info@asyncapi.io>
5765
author: asyncapi-bot <info@asyncapi.io>
58-
title: 'chore(release): ${{github.event.release.tag_name}}'
59-
body: 'Version bump in package.json for release [${{github.event.release.tag_name}}](${{github.event.release.html_url}})'
60-
branch: version-bump/${{github.event.release.tag_name}}
66+
title: 'chore(release): ${{ env.RELEASE_TAG }}'
67+
body: 'Version bump in package.json for release [${{ env.RELEASE_TAG }}](${{ env.RELEASE_URL }})'
68+
branch: version-bump/${{ env.RELEASE_TAG }}
6169
- if: failure() # Only, on failure, send a message on the 94_bot-failing-ci slack channel
6270
name: Report workflow run status to Slack
6371
uses: 8398a7/action-slack@28ba43ae48961b90635b50953d216767a6bea486 #using https://github.com/8398a7/action-slack/releases/tag/v3.16.2

‎.github/workflows/issues-prs-notifications.yml‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,15 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Convert markdown to slack markdown for issue
24-
uses: asyncapi/.github/.github/actions/slackify-markdown@master
24+
# This workflow is from our own org repo and safe to reference by 'master'.
25+
uses: asyncapi/.github/.github/actions/slackify-markdown@master # //NOSONAR
2526
id: issuemarkdown
27+
env:
28+
ISSUE_TITLE: ${{github.event.issue.title}}
29+
ISSUE_URL: ${{github.event.issue.html_url}}
30+
ISSUE_BODY: ${{github.event.issue.body}}
2631
with:
27-
markdown: "[${{github.event.issue.title}}](${{github.event.issue.html_url}}) \n ${{github.event.issue.body}}"
32+
markdown: "[${{ env.ISSUE_TITLE }}](${{ env.ISSUE_URL }}) \n ${{ env.ISSUE_BODY }}"
2833
- name: Send info about issue
2934
uses: rtCamp/action-slack-notify@c33737706dea87cd7784c687dadc9adf1be59990 # Using v2.3.2
3035
env:
@@ -39,10 +44,15 @@ jobs:
3944
runs-on: ubuntu-latest
4045
steps:
4146
- name: Convert markdown to slack markdown for pull request
42-
uses: asyncapi/.github/.github/actions/slackify-markdown@master
47+
# This workflow is from our own org repo and safe to reference by 'master'.
48+
uses: asyncapi/.github/.github/actions/slackify-markdown@master # //NOSONAR
4349
id: prmarkdown
50+
env:
51+
PR_TITLE: ${{github.event.pull_request.title}}
52+
PR_URL: ${{github.event.pull_request.html_url}}
53+
PR_BODY: ${{github.event.pull_request.body}}
4454
with:
45-
markdown: "[${{github.event.pull_request.title}}](${{github.event.pull_request.html_url}}) \n ${{github.event.pull_request.body}}"
55+
markdown: "[${{ env.PR_TITLE }}](${{ env.PR_URL }}) \n ${{ env.PR_BODY }}"
4656
- name: Send info about pull request
4757
uses: rtCamp/action-slack-notify@c33737706dea87cd7784c687dadc9adf1be59990 # Using v2.3.2
4858
env:
@@ -57,10 +67,15 @@ jobs:
5767
runs-on: ubuntu-latest
5868
steps:
5969
- name: Convert markdown to slack markdown for pull request
60-
uses: asyncapi/.github/.github/actions/slackify-markdown@master
70+
# This workflow is from our own org repo and safe to reference by 'master'.
71+
uses: asyncapi/.github/.github/actions/slackify-markdown@master # //NOSONAR
6172
id: discussionmarkdown
73+
env:
74+
DISCUSSION_TITLE: ${{github.event.discussion.title}}
75+
DISCUSSION_URL: ${{github.event.discussion.html_url}}
76+
DISCUSSION_BODY: ${{github.event.discussion.body}}
6277
with:
63-
markdown: "[${{github.event.discussion.title}}](${{github.event.discussion.html_url}}) \n ${{github.event.discussion.body}}"
78+
markdown: "[${{ env.DISCUSSION_TITLE }}](${{ env.DISCUSSION_URL }}) \n ${{ env.DISCUSSION_BODY }}"
6479
- name: Send info about pull request
6580
uses: rtCamp/action-slack-notify@c33737706dea87cd7784c687dadc9adf1be59990 # Using v2.3.2
6681
env:

‎.github/workflows/notify-tsc-members-mention.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ jobs:
4343
# Handling Slack notifications
4444
#########
4545
- name: Convert markdown to slack markdown
46-
uses: asyncapi/.github/.github/actions/slackify-markdown@master
46+
# This workflow is from our own org repo and safe to reference by 'master'.
47+
uses: asyncapi/.github/.github/actions/slackify-markdown@master # //NOSONAR
4748
id: issuemarkdown
4849
with:
4950
markdown: "[${{github.event.issue.title}}](${{github.event.issue.html_url}}) \n ${{github.event.issue.body}}"
@@ -89,7 +90,8 @@ jobs:
8990
# Handling Slack notifications
9091
#########
9192
- name: Convert markdown to slack markdown
92-
uses: asyncapi/.github/.github/actions/slackify-markdown@master
93+
# This workflow is from our own org repo and safe to reference by 'master'.
94+
uses: asyncapi/.github/.github/actions/slackify-markdown@master # //NOSONAR
9395
id: prmarkdown
9496
with:
9597
markdown: "[${{github.event.pull_request.title}}](${{github.event.pull_request.html_url}}) \n ${{github.event.pull_request.body}}"
@@ -135,7 +137,8 @@ jobs:
135137
# Handling Slack notifications
136138
#########
137139
- name: Convert markdown to slack markdown
138-
uses: asyncapi/.github/.github/actions/slackify-markdown@master
140+
# This workflow is from our own org repo and safe to reference by 'master'.
141+
uses: asyncapi/.github/.github/actions/slackify-markdown@master # //NOSONAR
139142
id: discussionmarkdown
140143
with:
141144
markdown: "[${{github.event.discussion.title}}](${{github.event.discussion.html_url}}) \n ${{github.event.discussion.body}}"
@@ -181,7 +184,8 @@ jobs:
181184
# Handling Slack notifications
182185
#########
183186
- name: Convert markdown to slack markdown
184-
uses: asyncapi/.github/.github/actions/slackify-markdown@master
187+
# This workflow is from our own org repo and safe to reference by 'master'.
188+
uses: asyncapi/.github/.github/actions/slackify-markdown@master # //NOSONAR
185189
id: issuemarkdown
186190
with:
187191
markdown: "[${{github.event.issue.title}}](${{github.event.comment.html_url}}) \n ${{github.event.comment.body}}"
@@ -227,7 +231,8 @@ jobs:
227231
# Handling Slack notifications
228232
#########
229233
- name: Convert markdown to slack markdown
230-
uses: asyncapi/.github/.github/actions/slackify-markdown@master
234+
# This workflow is from our own org repo and safe to reference by 'master'.
235+
uses: asyncapi/.github/.github/actions/slackify-markdown@master # //NOSONAR
231236
id: prmarkdown
232237
with:
233238
markdown: "[${{github.event.issue.title}}](${{github.event.comment.html_url}}) \n ${{github.event.comment.body}}"
@@ -273,7 +278,8 @@ jobs:
273278
# Handling Slack notifications
274279
#########
275280
- name: Convert markdown to slack markdown
276-
uses: asyncapi/.github/.github/actions/slackify-markdown@master
281+
# This workflow is from our own org repo and safe to reference by 'master'.
282+
uses: asyncapi/.github/.github/actions/slackify-markdown@master # //NOSONAR
277283
id: discussionmarkdown
278284
with:
279285
markdown: "[${{github.event.discussion.title}}](${{github.event.comment.html_url}}) \n ${{github.event.comment.body}}"

0 commit comments

Comments
 (0)