Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into spec-v3-support
Browse files Browse the repository at this point in the history
  • Loading branch information
Souvikns committed Jan 11, 2024
2 parents 6be2ac1 + 777dec6 commit 35748a2
Show file tree
Hide file tree
Showing 159 changed files with 51,764 additions and 19,163 deletions.
30 changes: 29 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,42 @@
"contributions": [
"doc"
]
},
{
"login": "KhudaDad414",
"name": "Khuda Dad Nomani",
"avatar_url": "https://avatars.githubusercontent.com/u/32505158?v=4",
"profile": "https://github.com/KhudaDad414",
"contributions": [
"code"
]
},
{
"login": "oviecodes",
"name": "Godwin Alexander",
"avatar_url": "https://avatars.githubusercontent.com/u/61796959?v=4",
"profile": "https://github.com/oviecodes",
"contributions": [
"doc",
"code"
]
},
{
"login": "freakfan15",
"name": "Vivek Kumar",
"avatar_url": "https://avatars.githubusercontent.com/u/54408801?v=4",
"profile": "https://github.com/freakfan15",
"contributions": [
"code"
]
}
],
"contributorsPerLine": 7,
"projectName": "glee",
"projectOwner": "asyncapi",
"repoType": "github",
"repoHost": "https://github.com",
"skipCi": true,
"skipCi": false,
"commitType": "docs",
"commitConvention": "angular"
}
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
"error",
"multi-line"
],
"security/detect-non-literal-fs-filename": "off",
"@typescript-eslint/no-explicit-any": "off",
"semi": [
"warn",
Expand Down
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
2 changes: 1 addition & 1 deletion .github/workflows/bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:
github_token: ${{ secrets.GH_TOKEN }}
committer_username: asyncapi-bot
committer_email: [email protected]
repos_to_ignore: html-template # this is temporary until react component releases 1.0, then it can be removed
repos_to_ignore: spec,bindings
51 changes: 51 additions & 0 deletions .github/workflows/update-docs-in-website.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Update latest Glee documentation in the website

on:
push:
branches:
- 'master'
paths:
- 'docs/pages/*.md'

jobs:
Make-PR:
name: Make PR on website repository with updated latest Glee documentation
runs-on: ubuntu-latest
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
steps:
- name: Checkout Current repository
uses: actions/checkout@v3
with:
path: glee
- name: Checkout Another repository
uses: actions/checkout@v3
with:
repository: asyncapi/website
path: website
token: ${{ env.GITHUB_TOKEN }}
- name: Config git
run: |
git config --global user.name asyncapi-bot
git config --global user.email [email protected]
- name: Create branch
working-directory: ./website
run: |
git checkout -b update-glee-docs-${{ github.sha }}
- name: Copy glee folder from Current Repo to Another
working-directory: ./website
run: |
rm -r ./pages/docs/tools/glee
mkdir -p ./pages/docs/tools/glee
printf "%s\ntitle: Glee\nweight: 06\n%s" "---" "---"> ../glee/docs/_section.md
mv ../glee/docs/pages/*.{md,jpg,png} ./pages/docs/tools/glee
- name: Commit and push
working-directory: ./website
run: |
git add .
git commit -m "docs(glee): update latest glee docs"
git push https://${{ env.GITHUB_TOKEN }}@github.com/asyncapi/website
- name: Create PR
working-directory: ./website
run: |
gh pr create --title "docs(glee): update latest glee documentation" --body "Updated glee documentation is available and this PR introduces update to glee folder on the website" --head "update-glee-docs-${{ github.sha }}"
57 changes: 57 additions & 0 deletions .github/workflows/update-docs-on-docs-commits.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# This workflow is centrally managed in https://github.com/asyncapi/.github/
# Don't make changes to this file in this repo as they will be overwritten with changes made to the same file in above mentioned repo

# The given workflow is responsible for generating docs and creating PR with them when there is a commit with docs: prefix

# This workflow will be updated in all repos with the topic get-global-docs-autoupdate

name: 'Update generated parts of documentation on docs: commits'

on:
push:
branches:
- master

jobs:
docs-gen:
name: 'Generate docs and create PR'
runs-on: ubuntu-latest
# PR should be created within this GH action only if it is a docs: commit
# Otherwise it will conflict with release workflow
if: startsWith(github.event.commits[0].message, 'docs:')
steps:
- name: Checkout repo
uses: actions/checkout@v4
- 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 ci
- name: Regenerate docs
run: npm run generate:assets --if-present
- name: Create Pull Request with updated docs
uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 # uses 5.0.2 https://github.com/peter-evans/create-pull-request/releases/tag/v5.0.2
with:
token: ${{ secrets.GH_TOKEN }}
commit-message: 'chore: update generated docs'
committer: asyncapi-bot <[email protected]>
author: asyncapi-bot <[email protected]>
title: 'chore: update generated docs'
body: 'Update of docs that are generated and were forgotten on PR level.'
branch: gen-docs-update/${{ github.job }}
- name: Report workflow status to Slack
if: failure() # Only, on failure, send a message on the 94_bot-failing-ci slack channel
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
text: 'AsyncAPI docs generation workflow failed'
author_name: asyncapi-bot
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_CI_FAIL_NOTIFY }}
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![Glee — The AsyncAPI framework that will make you smile again.](assets/readme-banner.png)

<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-)
[![All Contributors](https://img.shields.io/badge/all_contributors-5-orange.svg?style=flat-square)](#contributors-)
<!-- ALL-CONTRIBUTORS-BADGE:END -->


Expand Down Expand Up @@ -54,6 +54,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sudoshreyansh"><img src="https://avatars.githubusercontent.com/u/44190883?v=4?s=100" width="100px;" alt="sudoshreyansh"/><br /><sub><b>sudoshreyansh</b></sub></a><br /><a href="https://github.com/asyncapi/glee/commits?author=sudoshreyansh" title="Tests">⚠️</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/afzal442"><img src="https://avatars.githubusercontent.com/u/11625672?v=4?s=100" width="100px;" alt="Afzal Ansari"/><br /><sub><b>Afzal Ansari</b></sub></a><br /><a href="https://github.com/asyncapi/glee/commits?author=afzal442" title="Documentation">📖</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/KhudaDad414"><img src="https://avatars.githubusercontent.com/u/32505158?v=4?s=100" width="100px;" alt="Khuda Dad Nomani"/><br /><sub><b>Khuda Dad Nomani</b></sub></a><br /><a href="https://github.com/asyncapi/glee/commits?author=KhudaDad414" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/oviecodes"><img src="https://avatars.githubusercontent.com/u/61796959?v=4?s=100" width="100px;" alt="Godwin Alexander"/><br /><sub><b>Godwin Alexander</b></sub></a><br /><a href="https://github.com/asyncapi/glee/commits?author=oviecodes" title="Documentation">📖</a> <a href="https://github.com/asyncapi/glee/commits?author=oviecodes" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/freakfan15"><img src="https://avatars.githubusercontent.com/u/54408801?v=4?s=100" width="100px;" alt="Vivek Kumar"/><br /><sub><b>Vivek Kumar</b></sub></a><br /><a href="https://github.com/asyncapi/glee/commits?author=freakfan15" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
26 changes: 0 additions & 26 deletions docs/app-structure.md

This file was deleted.

9 changes: 0 additions & 9 deletions docs/env-vars.md

This file was deleted.

64 changes: 0 additions & 64 deletions docs/functions.md

This file was deleted.

58 changes: 0 additions & 58 deletions docs/lifecycle-events.md

This file was deleted.

4 changes: 4 additions & 0 deletions docs/pages/_section.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
title: Glee
weight: 10
---
Loading

0 comments on commit 35748a2

Please sign in to comment.