Skip to content

Commit

Permalink
Merge branch 'master' into issue-asyncapi#2181
Browse files Browse the repository at this point in the history
  • Loading branch information
akshatnema authored Dec 7, 2023
2 parents 1fc1864 + 1a78f60 commit 8b53296
Show file tree
Hide file tree
Showing 102 changed files with 6,853 additions and 20,608 deletions.
30 changes: 5 additions & 25 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,6 @@
module.exports = {
"env": {
"browser": true,
"es6": true,
},
"extends": ["eslint:recommended", "plugin:react/recommended", "plugin:cypress/recommended"],
"globals": {
"Atomics": "readonly",
"SharedArrayBuffer": "readonly",
"React": "writable"
},
"parserOptions": {
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2019,
"sourceType": "module"
},
"plugins": [
"react",
],
"rules": {
"react/react-in-jsx-scope": "off",
"no-useless-catch": "off",
},
};
extends: ['@anshgoyalevil/eslint-config'],
rules: {
// add any additional or overridden rules here
}
}
2 changes: 1 addition & 1 deletion .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
env:
GITHUB_TOKEN: "${{ secrets.GH_TOKEN }}"
GITHUB_LOGIN: asyncapi-bot
MERGE_LABELS: ""
MERGE_LABELS: "!do-not-merge"
MERGE_METHOD: "squash"
MERGE_COMMIT_MESSAGE: "{pullRequest.title} (#{pullRequest.number})"
MERGE_RETRIES: "20"
Expand Down
10 changes: 8 additions & 2 deletions .github/workflows/cypress-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,16 @@ jobs:
- name: Checkout code
uses: actions/checkout@v3

- name: Use Node.js 16.x
- name: Check package-lock version
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
id: lockversion

- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'

- name: Install dependencies
run: npm install
Expand Down
16 changes: 0 additions & 16 deletions .github/workflows/deploy.yml

This file was deleted.

8 changes: 4 additions & 4 deletions .github/workflows/lighthouse-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:

- if: steps.should_run.outputs.shouldrun == 'true'
name: Await Netlify Preview
uses: jakepartusch/wait-for-netlify-action@v1
uses: jakepartusch/wait-for-netlify-action@f1e137043864b9ab9034ae3a5adc1c108e3f1a48 #version 1.4 https://github.com/JakePartusch/wait-for-netlify-action/releases/tag/v1.4
id: netlify
with:
site_name: asyncapi-website
Expand All @@ -48,7 +48,7 @@ jobs:
- if: steps.should_run.outputs.shouldrun == 'true'
name: Lighthouse Audit
id: lighthouse_audit
uses: treosh/lighthouse-ci-action@9.3.0
uses: treosh/lighthouse-ci-action@03becbfc543944dd6e7534f7ff768abb8a296826 #version 10.1 https://github.com/treosh/lighthouse-ci-action/releases/tag/10.1.0
with:
urls: |
https://deploy-preview-$PR_NUMBER--asyncapi-website.netlify.app/
Expand Down Expand Up @@ -87,9 +87,9 @@ jobs:
- if: steps.should_run.outputs.shouldrun == 'true'
name: LightHouse Statistic Comment
id: lighthouse_statistic_comment
uses: marocchino/sticky-pull-request-comment@v2.2.0
uses: marocchino/sticky-pull-request-comment@efaaab3fd41a9c3de579aba759d2552635e590fd # version 2.8 https://github.com/marocchino/sticky-pull-request-comment/releases/tag/v2.8.0
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
number: ${{ github.event.pull_request.number }}
header: lighthouse
message: ${{ steps.lighthouse_score_report.outputs.comment }}
2 changes: 1 addition & 1 deletion .github/workflows/lighthouserc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"assert": {
"assertions": {
"categories:accessibility": ["error", {"minScore": 0.98}],
"categories:best-practices": ["error", {"minScore": 1.00}],
"categories:best-practices": ["error", {"minScore": 0.92}],
"categories:seo": ["error", {"minScore": 1.00}]
}
},
Expand Down
20 changes: 17 additions & 3 deletions .github/workflows/regenerate-meetings-and-videos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,27 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Check package-lock version
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
id: lockversion

- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'

- name: Install dependencies
run: npm install

- name: Regenerate
run: npm run generate:meetings && npm run generate:videos && npm run generate:dashboard

- name: Create Pull Request with new meetings.json, newsroom-videos.json and dashboard.json version
uses: peter-evans/create-pull-request@v3
uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # use 4.2.4 https://github.com/peter-evans/create-pull-request/releases/tag/v4.2.4
with:
token: ${{ secrets.GH_TOKEN }}
commit-message: 'chore: update meetings.json, newsrooom_videos.json and dashboard.json'
Expand All @@ -34,7 +48,7 @@ jobs:
branch: update-meetings/${{ github.job }}
- if: failure() # Only, on failure, send a message on the 94_bot-failing-ci slack channel
name: Report workflow run status to Slack
uses: 8398a7/action-slack@v3
uses: 8398a7/action-slack@fbd6aa58ba854a740e11a35d0df80cb5d12101d8 #using https://github.com/8398a7/action-slack/releases/tag/v3.15.1
with:
status: ${{ job.status }}
fields: repo,action,workflow
Expand Down
19 changes: 15 additions & 4 deletions .github/workflows/regenerate-tools.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,37 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}

- name: Check package-lock version
uses: asyncapi/.github/.github/actions/get-node-version-from-package-lock@master
id: lockversion

- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: "${{ steps.lockversion.outputs.version }}"
cache: 'npm'
cache-dependency-path: '**/package-lock.json'

- name: Install dependencies
run: npm install

- name: Regenerate
run: npm run generate:tools

- name: Create Pull Request with new tools.json version
uses: peter-evans/create-pull-request@v4
uses: peter-evans/create-pull-request@38e0b6e68b4c852a5500a94740f0e535e0d7ba54 # use 4.2.4 https://github.com/peter-evans/create-pull-request/releases/tag/v4.2.4
with:
token: ${{ secrets.GH_TOKEN }}
commit-message: 'chore: update tools.json'
committer: asyncapi-bot <[email protected]>
author: asyncapi-bot <[email protected]>
title: 'chore: update tools.json'
branch: update-tools/${{ github.job }}

- if: failure() # Only, on failure, send a message on the 94_bot-failing-ci slack channel
name: Report workflow run status to Slack
uses: 8398a7/action-slack@v3
uses: 8398a7/action-slack@fbd6aa58ba854a740e11a35d0df80cb5d12101d8 #using https://github.com/8398a7/action-slack/releases/tag/v3.15.1
with:
status: ${{ job.status }}
fields: repo,action,workflow
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/validate-case-studies-structures.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v35
uses: tj-actions/changed-files@af292f1e845a0377b596972698a8598734eb2796 # using https://github.com/tj-actions/changed-files/releases/tag/v40
with:
files: config/casestudies/*.yml

- name: Install ajv and yaml
run: npm install [email protected] [email protected] [email protected]

- name: Run validation script
uses: actions/github-script@v6
with:
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ Use the following tools to set up the project:
- [Node.js](https://nodejs.org/) v16.0.0+
- [npm](https://www.npmjs.com/) v7.10.0+


## Run locally

1. Fork the repository by clicking on `Fork` option on top right of the main repository.
Expand Down
Loading

0 comments on commit 8b53296

Please sign in to comment.