Skip to content

Commit e67b253

Browse files
committed
Merge branch 'master' into feat/add-eslint-plugin-jsdoc
* master: (24 commits) chore: Refactored code location for iterators (asyncapi#225) chore(release): 1.3.1 (asyncapi#222) fix: apply traits to standalone messages from components section (asyncapi#214) test: improve feedback loop from browser tests (asyncapi#216) ci: fix the space-issue in bump workflow (asyncapi#218) ci: update global workflows (asyncapi#217) chore(deps): bump ini from 1.3.5 to 1.3.7 (asyncapi#215) ci: rename pr testing job name and test node 14 (asyncapi#213) ci: bump workflow to start on push instead of release (asyncapi#212) chore(release): 1.3.0 (asyncapi#211) feat: add a traverse schema function (asyncapi#198) ci: add workflow that bumps parser in other asyncapi repos (asyncapi#208) ci: fix release workflow step that is responsible for handling twitter (asyncapi#209) ci: update global workflows (asyncapi#206) ci: disable any testing on draft PR (asyncapi#204) chore(release): 1.2.0 (asyncapi#202) feat: extend the components and asyncapi model with has-like functions (asyncapi#192) chore(deps-dev): bump semantic-release from 17.0.6 to 17.2.3 (asyncapi#199) chore(release): 1.1.1 (asyncapi#197) fix: channels with name '/' fail on validation (asyncapi#196) ...
2 parents ffa7fb4 + 1f041a0 commit e67b253

34 files changed

+2378
-1031
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,15 @@
102102
"contributions": [
103103
"infra"
104104
]
105+
},
106+
{
107+
"login": "juergenbr",
108+
"name": "Jürgen B.",
109+
"avatar_url": "https://avatars3.githubusercontent.com/u/683438?v=4",
110+
"profile": "https://www.linkedin.com/in/jbreitenbaumer/",
111+
"contributions": [
112+
"code"
113+
]
105114
}
106115
],
107116
"contributorsPerLine": 4,

.eslintignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
node_modules
22
dist
33
lib/browser.js
4-
scripts
4+
scripts
5+
coverage
6+
.nyc_output
7+
test/sample_browser/

.github/workflows/automerge.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ on:
2222
jobs:
2323

2424
autoapprove:
25+
if: github.event.pull_request.draft == false
2526
runs-on: ubuntu-latest
2627
steps:
2728
- name: Autoapproving

.github/workflows/bump.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Bump package version in dependent repos
2+
3+
on:
4+
#It cannot run on release event as when release is created then version is not yet bumped in package.json
5+
#This means we cannot extract easily latest version and have a risk that package is not yet on npm
6+
push:
7+
branches:
8+
- master
9+
10+
jobs:
11+
bump:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout repo
15+
uses: actions/checkout@v2
16+
- name: Get version from package.json before release step
17+
id: extractver
18+
run: echo "::set-output name=version::$(npm run get-version --silent)"
19+
- name: Get name of package from package.json
20+
id: extractname
21+
run: echo "::set-output name=packname::$(npm run get-name --silent)"
22+
- if: startsWith(github.event.commits[0].message, 'chore(release):')
23+
name: Bumping latest version of this package in other repositories
24+
uses: derberg/org-projects-dependency-manager@v1
25+
with:
26+
github_token: ${{ secrets.GH_TOKEN }}
27+
committer_username: asyncapi-bot
28+
committer_email: [email protected]
29+
#This is commit message and PR title for repos where this package is in dependencies
30+
commit_message_prod: 'fix: update ${{ steps.extractname.outputs.packname }} to ${{ steps.extractver.outputs.version }} version'
31+
#This is commit message and PR title for repos where this package is in devDependencies
32+
commit_message_dev: 'chore: update ${{ steps.extractname.outputs.packname }} to ${{ steps.extractver.outputs.version }} version'

.github/workflows/pull-request-testing.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,25 @@ name: Pull request testing
22

33
on:
44
pull_request:
5-
types: [opened, reopened, synchronize]
5+
types: [opened, reopened, synchronize, ready_for_review]
66

77
jobs:
8-
release:
9-
name: 'Run tests'
8+
test_pr:
9+
if: github.event.pull_request.draft == false
10+
name: 'Testing pull request'
1011
runs-on: ubuntu-latest
1112
steps:
1213
- name: Checkout repo
1314
uses: actions/checkout@v2
1415
- name: Setup Node.js
1516
uses: actions/setup-node@v1
1617
with:
17-
node-version: 13
18+
node-version: 14
1819
- name: Install dependencies
1920
run: npm ci
2021
- name: Run linter
2122
run: npm run lint
2223
- name: Run tests
2324
run: npm test
24-
- name: Regenerate types to make sure nothing is broken
25-
run: npm run types
2625
- name: Regenerate docs to make sure jsdoc are not broken
27-
run: npm run docs
26+
run: npm run docs

.github/workflows/release.yml

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup Node.js
1616
uses: actions/setup-node@v1
1717
with:
18-
node-version: 13
18+
node-version: 14
1919
- name: Install dependencies
2020
run: npm ci
2121
- name: Run tests
@@ -44,26 +44,30 @@ jobs:
4444
- name: Get version from package.json after release step
4545
id: extractver
4646
run: echo "::set-output name=version::$(npm run get-version --silent)"
47-
- name: Create Pull Request with updated package files
48-
if: steps.initversion.outputs.version != steps.extractver.outputs.version
49-
uses: peter-evans/[email protected]
50-
with:
51-
token: ${{ secrets.GH_TOKEN }}
52-
commit-message: 'chore(release): ${{ steps.extractver.outputs.version }}'
53-
committer: asyncapi-bot <[email protected]>
54-
author: asyncapi-bot <[email protected]>
55-
title: 'chore(release): ${{ steps.extractver.outputs.version }}'
56-
body: 'Version bump in package.json and package-lock.json for release [${{ steps.extractver.outputs.version }}](https://github.com/${{github.repository}}/releases/tag/v${{ steps.extractver.outputs.version }})'
57-
branch: version-bump/${{ steps.extractver.outputs.version }}
5847
- name: Check if version changed # Version check based on package.json version number
5948
uses: EndBug/[email protected]
6049
id: check
50+
with:
51+
# we need to statically check that local version is now newer than the one in master
52+
file-url: https://raw.githubusercontent.com/${{github.repository}}/master/package.json
53+
static-checking: localIsNew
6154
- name: Publish information about the release to Twitter # tweet only if detected version change is not a patch
62-
if: steps.check.outputs.changed == 'true' && steps.check.outputs.type != 'patch'
55+
if: steps.initversion.outputs.version != steps.extractver.outputs.version && steps.check.outputs.changed == 'true' && steps.check.outputs.type != 'patch'
6356
uses: m1ner79/[email protected]
6457
with:
6558
twitter_status: "Release ${{ steps.extractver.outputs.version }} for ${{github.repository}} is out in the wild 😱💪🍾🎂\n\nThank you for the contribution ${{ github.event.commits[0].author.name }} https://github.com/${{github.repository}}/releases/tag/v${{ steps.extractver.outputs.version }}"
6659
twitter_consumer_key: ${{ secrets.TWITTER_CONSUMER_KEY }}
6760
twitter_consumer_secret: ${{ secrets.TWITTER_CONSUMER_SECRET }}
6861
twitter_access_token_key: ${{ secrets.TWITTER_ACCESS_TOKEN_KEY }}
6962
twitter_access_token_secret: ${{ secrets.TWITTER_ACCESS_TOKEN_SECRET }}
63+
- name: Create Pull Request with updated package files
64+
if: steps.initversion.outputs.version != steps.extractver.outputs.version
65+
uses: peter-evans/[email protected]
66+
with:
67+
token: ${{ secrets.GH_TOKEN }}
68+
commit-message: 'chore(release): ${{ steps.extractver.outputs.version }}'
69+
committer: asyncapi-bot <[email protected]>
70+
author: asyncapi-bot <[email protected]>
71+
title: 'chore(release): ${{ steps.extractver.outputs.version }}'
72+
body: 'Version bump in package.json and package-lock.json for release [${{ steps.extractver.outputs.version }}](https://github.com/${{github.repository}}/releases/tag/v${{ steps.extractver.outputs.version }})'
73+
branch: version-bump/${{ steps.extractver.outputs.version }}

.github/workflows/sentiment-analysis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
gcp_key: ${{ secrets.GCP_KEY_SENTIMENT }}
3535
- uses: someimportantcompany/github-actions-slack-message@v1
3636
# this step runs only if sentiment is a negative number
37-
if: steps.sentiments.outputs.sentiment < -0.2
37+
if: steps.sentiments.outputs.sentiment < -0.6
3838
with:
3939
webhook-url: ${{ secrets.SLACK_SENTIMENTS }}
4040
text: Here ${{steps.sentiments.outputs.source}} you can find a potential negative text that requires your attention as the sentiment analysis score is ${{steps.sentiments.outputs.sentiment}}

.github/workflows/stale-issues-prs.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
repo-token: ${{ secrets.GITHUB_TOKEN }}
1414
stale-issue-message: |
1515
This issue has been automatically marked as stale because it has not had recent activity :sleeping:
16-
It will be closed in 30 days if no further activity occurs. To unstale this issue, add a comment with detailed explanation.
16+
It will be closed in 60 days if no further activity occurs. To unstale this issue, add a comment with detailed explanation.
1717
Thank you for your contributions :heart:
1818
stale-pr-message: |
1919
This pull request has been automatically marked as stale because it has not had recent activity :sleeping:
20-
It will be closed in 30 days if no further activity occurs. To unstale this pull request, add a comment with detailed explanation.
20+
It will be closed in 60 days if no further activity occurs. To unstale this pull request, add a comment with detailed explanation.
2121
Thank you for your contributions :heart:
2222
days-before-stale: 60
23-
days-before-close: 30
23+
days-before-close: 60
2424
stale-issue-label: stale
2525
stale-pr-label: stale
2626
exempt-issue-label: keep-open
27-
exempt-pr-label: keep-open
27+
exempt-pr-label: keep-open

.github/workflows/welcome-first-time-contrib.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
welcome:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/first-interaction@v1.0.0
15+
- uses: actions/first-interaction@v1
1616
with:
1717
repo-token: ${{ secrets.GITHUB_TOKEN }}
1818
issue-message: |

0 commit comments

Comments
 (0)