Skip to content

Commit

Permalink
Merge branch 'master' into i18n-link
Browse files Browse the repository at this point in the history
  • Loading branch information
anshgoyalevil authored Nov 3, 2023
2 parents 8634178 + 53f8c8d commit 9801eb5
Show file tree
Hide file tree
Showing 15 changed files with 238 additions and 277 deletions.
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 }}
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
2 changes: 1 addition & 1 deletion components/Head.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function HeadComponent({
title = title ? `${title} | ${permTitle}` : permTitle;

//enable google analytics
if (typeof window !== 'undefined' && window.location.hostname === 'asyncapi.com') {
if (typeof window !== 'undefined' && window.location.hostname.includes('asyncapi.com')) {
TagManager.initialize({gtmId: 'GTM-T58BTVQ'})
ReactGA.initialize('UA-109278936-1')
ReactGA.pageview(window.location.pathname + window.location.search)
Expand Down
49 changes: 21 additions & 28 deletions config/meetings.json
Original file line number Diff line number Diff line change
@@ -1,25 +1,4 @@
[
{
"title": "Spec 3.0 Meeting",
"calLink": "https://www.google.com/calendar/event?eid=aGdqYmk0NDdiMGE4cGo4NzFuaWxycjNiYmsgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/761",
"banner": "",
"date": "2023-07-19T16:00:00.000Z"
},
{
"title": "Open Standards and Private Products: A DevRel's Dream or Nightmare",
"calLink": "https://www.google.com/calendar/event?eid=dHMzZ3Q0b2h2NDRuaTVrMTQ3cmsxYzk2bzAgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/775",
"banner": "https://user-images.githubusercontent.com/66913810/249772860-0b6c73a5-a740-4fac-a22d-2d95f823ae07.png",
"date": "2023-07-13T09:00:00.000Z"
},
{
"title": "Spec 3.0 Docs Meeting",
"calLink": "https://www.google.com/calendar/event?eid=NzU0aGMxOWY5MmYyYzA3OTduazF0MWZqY2MgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/790",
"banner": "",
"date": "2023-07-20T14:30:00.000Z"
},
{
"title": "Spec 3.0 Docs Meeting",
"calLink": "https://www.google.com/calendar/event?eid=cG9iOHNqZGlrbmg4cnUxanMzMTgyN3AxdnMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
Expand All @@ -41,13 +20,6 @@
"banner": "https://user-images.githubusercontent.com/40604284/252807786-f93110e3-c344-4080-9c4f-9d32cb324680.png",
"date": "2023-07-25T08:00:00.000Z"
},
{
"title": "Design meeting",
"calLink": "https://www.google.com/calendar/event?eid=czVxbG5jZXV2MThxczJjczdhMmtxZzE1djAgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/800",
"banner": "",
"date": "2023-07-18T08:00:00.000Z"
},
{
"title": "Community Meeting",
"calLink": "https://www.google.com/calendar/event?eid=YmlybTZwODdmMzBnNGg0b3J1OWxmdnBxNmMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
Expand Down Expand Up @@ -145,5 +117,26 @@
"url": "https://github.com/asyncapi/community/issues/912",
"banner": "https://user-images.githubusercontent.com/40604284/275363125-696a5c41-81b2-4e0b-a485-f108a7f525f0.png",
"date": "2023-10-17T08:00:00.000Z"
},
{
"title": "Community Meeting",
"calLink": "https://www.google.com/calendar/event?eid=ZGk3ZHJybXZhNmM3aWJzNWdzZWdtNTZjMHMgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/916",
"banner": "https://user-images.githubusercontent.com/40604284/277314120-f03a06ea-0820-462a-85af-18b1706ea5c6.png",
"date": "2023-10-31T16:00:00.000Z"
},
{
"title": "Community Meeting",
"calLink": "https://www.google.com/calendar/event?eid=b3BvZGhqN2xwZXFiMmtvOTQ1M2cwNGRlZTAgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/917",
"banner": "https://user-images.githubusercontent.com/40604284/277314352-f62224d8-03a9-46b2-94bf-13bfae6f973b.png",
"date": "2023-11-14T08:00:00.000Z"
},
{
"title": "Community Meeting",
"calLink": "https://www.google.com/calendar/event?eid=ODNjM2h0bGQ4dGhwcWd2Mmw2MWhkcGcycGcgY19xOXRzZWlnbG9tZHNqNm5qdWh2YnB0czExY0Bn",
"url": "https://github.com/asyncapi/community/issues/918",
"banner": "https://user-images.githubusercontent.com/40604284/277314435-ec985247-c575-4449-9f79-442b3077541a.png",
"date": "2023-11-28T16:00:00.000Z"
}
]
2 changes: 1 addition & 1 deletion config/newsroom_videos.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
"image_url": "https://i.ytimg.com/vi/FN5eR1Zqh9c/hqdefault.jpg",
"title": "AsyncAPI Conf on Tour 2023 in Madrid",
"description": "AACoT'23 Madrid Edition streamed live from StageOne at SNGULAR.",
"description": "AACoT'23 Madrid Edition streamed live from StageOne at SNGULAR. 00:00 Waiting 57:12 Opening 1:26:07 Everything You Wish ...",
"videoId": "FN5eR1Zqh9c"
},
{
Expand Down
Loading

0 comments on commit 9801eb5

Please sign in to comment.