Skip to content

Commit f6047c6

Browse files
derbergderberg
authored
Merge branch 'master' into fix/update-json-path-plus
2 parents 1895233 + 9a57fa2 commit f6047c6

36 files changed

Lines changed: 1099 additions & 937 deletions

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ jobs:
2626
runs-on: ubuntu-latest
2727
steps:
2828
- name: Add ready-to-merge label
29-
uses: actions/github-script@v6
29+
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.
@@ -78,7 +80,7 @@ jobs:
7880
runs-on: ubuntu-latest
7981
steps:
8082
- name: Add do-not-merge label
81-
uses: actions/github-script@v6
83+
uses: actions/github-script@v7
8284
with:
8385
github-token: ${{ secrets.GH_TOKEN }}
8486
script: |
@@ -100,7 +102,7 @@ jobs:
100102
runs-on: ubuntu-latest
101103
steps:
102104
- name: Add autoupdate label
103-
uses: actions/github-script@v6
105+
uses: actions/github-script@v7
104106
with:
105107
github-token: ${{ secrets.GH_TOKEN }}
106108
script: |

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v3
17+
uses: actions/checkout@v4
1818
- name: Get list of orphans
19-
uses: actions/github-script@v6
19+
uses: actions/github-script@v7
2020
id: orphans
2121
with:
2222
github-token: ${{ secrets.GITHUB_TOKEN }}
@@ -52,13 +52,14 @@ 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}})"
5960
- if: steps.orphans.outputs.found == 'true'
6061
name: Send info about orphan to slack
61-
uses: rtCamp/action-slack-notify@v2
62+
uses: rtCamp/action-slack-notify@c33737706dea87cd7784c687dadc9adf1be59990 # Using v2.3.2
6263
env:
6364
SLACK_WEBHOOK: ${{secrets.SLACK_CI_FAIL_NOTIFY}}
6465
SLACK_TITLE: 🚨 Not merged PR that should be automerged 🚨

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

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,16 @@ jobs:
3232

3333
steps:
3434
- name: ❌ @${{github.actor}} made an unauthorized attempt to use a Bounty Program's command
35-
uses: actions/github-script@v6
36-
35+
uses: actions/github-script@v7
36+
env:
37+
ACTOR: ${{ github.actor }}
3738
with:
3839
github-token: ${{ secrets.GH_TOKEN }}
3940
script: |
40-
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.
4142
These commands can only be used by members of the [Bounty Team](https://github.com/orgs/asyncapi/teams/bounty_team).`;
4243
43-
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.`);
4445
github.rest.issues.createComment({
4546
issue_number: context.issue.number,
4647
owner: context.repo.owner,
@@ -59,8 +60,7 @@ jobs:
5960

6061
steps:
6162
- name: Add label `bounty`
62-
uses: actions/github-script@v6
63-
63+
uses: actions/github-script@v7
6464
with:
6565
github-token: ${{ secrets.GH_TOKEN }}
6666
script: |
@@ -101,8 +101,7 @@ jobs:
101101

102102
steps:
103103
- name: Remove label `bounty`
104-
uses: actions/github-script@v6
105-
104+
uses: actions/github-script@v7
106105
with:
107106
github-token: ${{ secrets.GH_TOKEN }}
108107
script: |

‎.github/workflows/bump.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,21 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout repo
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
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: 3 additions & 4 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 && !(
@@ -52,7 +50,8 @@ jobs:
5250
shell: bash
5351
- if: steps.packagejson.outputs.exists == 'true'
5452
name: Check package-lock version
55-
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
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
5655
id: lockversion
5756
- if: steps.packagejson.outputs.exists == 'true'
5857
name: Setup Node.js

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

Lines changed: 22 additions & 12 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
@@ -71,7 +78,7 @@ jobs:
7178
run: npm test --if-present
7279
- if: failure() # Only, on failure, send a message on the 94_bot-failing-ci slack channel
7380
name: Report workflow run status to Slack
74-
uses: 8398a7/action-slack@v3
81+
uses: 8398a7/action-slack@28ba43ae48961b90635b50953d216767a6bea486 #using https://github.com/8398a7/action-slack/releases/tag/v3.16.2
7582
with:
7683
status: ${{ job.status }}
7784
fields: repo,action,workflow
@@ -95,37 +102,40 @@ 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
128-
uses: 8398a7/action-slack@v3
138+
uses: 8398a7/action-slack@28ba43ae48961b90635b50953d216767a6bea486 #using https://github.com/8398a7/action-slack/releases/tag/v3.16.2
129139
with:
130140
status: ${{ job.status }}
131141
fields: repo,action,workflow

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

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- name: Checkout repository
18-
uses: actions/checkout@v3
18+
uses: actions/checkout@v4
1919
with:
2020
# target branch of release. More info https://docs.github.com/en/rest/reference/repos#releases
2121
# in case release is created from release branch then we need to checkout from given branch
@@ -26,11 +26,12 @@ jobs:
2626
run: test -e ./package.json && echo "exists=true" >> $GITHUB_OUTPUT || echo "exists=false" >> $GITHUB_OUTPUT
2727
- if: steps.packagejson.outputs.exists == 'true'
2828
name: Check package-lock version
29-
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
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
3031
id: lockversion
3132
- if: steps.packagejson.outputs.exists == 'true'
3233
name: Setup Node.js
33-
uses: actions/setup-node@v3
34+
uses: actions/setup-node@v4
3435
with:
3536
node-version: "${{ steps.lockversion.outputs.version }}"
3637
cache: 'npm'
@@ -46,21 +47,26 @@ jobs:
4647
# There is no need to substract "v" from the tag as version script handles it
4748
# 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
4849
# 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
50+
env:
51+
VERSION: ${{github.event.release.tag_name}}
52+
run: npm run bump:version
5053
- if: steps.packagejson.outputs.exists == 'true'
5154
name: Create Pull Request with updated asset files including package.json
5255
uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # use 4.2.4 https://github.com/peter-evans/create-pull-request/releases/tag/v4.2.4
56+
env:
57+
RELEASE_TAG: ${{github.event.release.tag_name}}
58+
RELEASE_URL: ${{github.event.release.html_url}}
5359
with:
5460
token: ${{ secrets.GH_TOKEN }}
55-
commit-message: 'chore(release): ${{github.event.release.tag_name}}'
61+
commit-message: 'chore(release): ${{ env.RELEASE_TAG }}'
5662
committer: asyncapi-bot <info@asyncapi.io>
5763
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}}
64+
title: 'chore(release): ${{ env.RELEASE_TAG }}'
65+
body: 'Version bump in package.json for release [${{ env.RELEASE_TAG }}](${{ env.RELEASE_URL }})'
66+
branch: version-bump/${{ env.RELEASE_TAG }}
6167
- if: failure() # Only, on failure, send a message on the 94_bot-failing-ci slack channel
6268
name: Report workflow run status to Slack
63-
uses: 8398a7/action-slack@v3
69+
uses: 8398a7/action-slack@28ba43ae48961b90635b50953d216767a6bea486 #using https://github.com/8398a7/action-slack/releases/tag/v3.16.2
6470
with:
6571
status: ${{ job.status }}
6672
fields: repo,action,workflow

0 commit comments

Comments
 (0)