Skip to content

Commit

Permalink
Merge branch 'master' into conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
quetzalliwrites authored May 9, 2024
2 parents 1c30042 + d0b2e01 commit 0b9421a
Show file tree
Hide file tree
Showing 21 changed files with 551 additions and 116 deletions.
18 changes: 0 additions & 18 deletions .github/ISSUE_TEMPLATE/bug.md

This file was deleted.

83 changes: 83 additions & 0 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
name: 🐛 Bug Report
description: Report bugs to fix and improve.
title: "[BUG] <description>"
labels: ["bug"]


body:
- type: textarea
id: description
attributes:
label: Describe the bug.
description: A clear and concise description of what the bug is.
validations:
required: true

- type: textarea
id: expected
attributes:
label: Expected behavior
description: A clear and concise description of what you expected to happen.
validations:
required: true


- type: textarea
id: screenshots
attributes:
label: Screenshots
description: Please add screenshots/video of the bug you faced.
validations:
required: true

- type: textarea
id: reproduce
attributes:
label: How to Reproduce
description: Attach all steps/share a github gist that can help anyone reproduce the bug.
value: |
1. I first did this
2. I then did this
3. And so on . . .
validations:
required: true

- type: dropdown
id: browser
attributes:
label: "🥦 Browser"
description: "What browser are you using?"
options:
- Google Chrome
- Brave
- Microsoft Edge
- Mozilla Firefox
- Safari
- Opera
- Other
validations:
required: false

- type: checkboxes
id: no-duplicate-issues
attributes:
label: "👀 Have you checked for similar open issues?"
options:
- label: "I checked and didn't find similar issue"
required: true

- type: checkboxes
id: read-code-of-conduct
attributes:
label: "🏢 Have you read the Contributing Guidelines?"
options:
- label: "I have read the [Contributing Guidelines](https://github.com/asyncapi/.github/blob/master/CONTRIBUTING.md)"
required: true

- type: dropdown
attributes:
label: Are you willing to work on this issue ?
description: This is absolutely not required, but we are happy to guide you in the contribution process.
options:
- "Yes I am willing to submit a PR!"
- "No, someone else can work on it"
18 changes: 0 additions & 18 deletions .github/ISSUE_TEMPLATE/enhancement.md

This file was deleted.

70 changes: 70 additions & 0 deletions .github/ISSUE_TEMPLATE/enhancement.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
name: 💡 Feature Request
description: Suggest a new idea/feature
title: "[FEATURE] <description>"
labels: ["enhancement"]

body:
- type: textarea
id: need_improvement
attributes:
label: Why do we need this improvement?
validations:
required: true

- type: textarea
id: change
attributes:
label: How will this change help?
validations:
required: true

- type: textarea
id: screenshots
attributes:
label: Screenshots
description: Please add screenshots if applicable
validations:
required: false


- type: textarea
id: implemented
attributes:
label: How could it be implemented/designed?
validations:
required: true

- type: dropdown
id: breakingchange
attributes:
label: "🚧 Breaking changes"
description: "Will this be a breaking change?"
options:
- "Yes"
- "No"
validations:
required: true

- type: checkboxes
id: no-duplicate-issues
attributes:
label: "👀 Have you checked for similar open issues?"
options:
- label: "I checked and didn't find a similar issue"
required: true

- type: checkboxes
id: read-code-of-conduct
attributes:
label: "🏢 Have you read the Contributing Guidelines?"
options:
- label: "I have read the [Contributing Guidelines](https://github.com/asyncapi/.github/blob/master/CONTRIBUTING.md)"
required: true

- type: dropdown
attributes:
label: Are you willing to work on this issue?
description: This is absolutely not required, but we are happy to guide you in the contribution process.
options:
- "Yes I am willing to submit a PR!"
- "No, someone else can work on it."
1 change: 1 addition & 0 deletions .github/workflows/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
**
2 changes: 2 additions & 0 deletions .github/workflows/.releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ branches:
prerelease: true
- name: alpha
prerelease: true
- name: next
prerelease: true
plugins:
- - "@semantic-release/commit-analyzer"
- preset: conventionalcommits
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@ jobs:
body: `Hello, @${{ github.actor }}! 👋🏼
This PR is not up to date with the base branch and can't be merged.
Please update your branch manually with the latest version of the base branch.
PRO-TIP: Add a comment to your PR with the text: \`/au\` or \`/autoupdate\` and our bot will take care of updating the branch in the future. The only requirement for this to work is to enable [Allow edits from maintainers](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) option in your PR.
PRO-TIP: To request an update from the upstream branch, simply comment \`/u\` or \`/update\` and our bot will handle the update operation promptly.
The only requirement for this to work is to enable [Allow edits from maintainers](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork) option in your PR. Also the update will not work if your fork is located in an organization, not under your personal profile.
Thanks 😄`
})
}
Expand Down
68 changes: 34 additions & 34 deletions .github/workflows/autoupdate.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
# This action 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

# This workflow is designed to work with:
# - autoapprove and automerge workflows for dependabot and asyncapibot.
# - special release branches that we from time to time create in upstream repos. If we open up PRs for them from the very beginning of the release, the release branch will constantly update with new things from the destination branch they are opened against

# It uses GitHub Action that auto-updates pull requests branches, whenever changes are pushed to their destination branch.
# Autoupdating to latest destination branch works only in the context of upstream repo and not forks

name: autoupdate

on:
push:
branches-ignore:
- 'version-bump/**'
- 'dependabot/**'
- 'bot/**'
- 'all-contributors/**'

jobs:
autoupdate-for-bot:
if: startsWith(github.repository, 'asyncapi/')
name: Autoupdate autoapproved PR created in the upstream
runs-on: ubuntu-latest
steps:
- name: Autoupdating
uses: docker://chinthakagodawita/autoupdate-action:v1
env:
GITHUB_TOKEN: '${{ secrets.GH_TOKEN_BOT_EVE }}'
PR_FILTER: "labelled"
PR_LABELS: "autoupdate"
PR_READY_STATE: "ready_for_review"
MERGE_CONFLICT_ACTION: "ignore"
# This action 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

# This workflow is designed to work with:
# - autoapprove and automerge workflows for dependabot and asyncapibot.
# - special release branches that we from time to time create in upstream repos. If we open up PRs for them from the very beginning of the release, the release branch will constantly update with new things from the destination branch they are opened against

# It uses GitHub Action that auto-updates pull requests branches, whenever changes are pushed to their destination branch.
# Autoupdating to latest destination branch works only in the context of upstream repo and not forks

name: autoupdate

on:
push:
branches-ignore:
- 'version-bump/**'
- 'dependabot/**'
- 'bot/**'
- 'all-contributors/**'

jobs:
autoupdate-for-bot:
if: startsWith(github.repository, 'asyncapi/')
name: Autoupdate autoapproved PR created in the upstream
runs-on: ubuntu-latest
steps:
- name: Autoupdating
uses: docker://chinthakagodawita/autoupdate-action:v1
env:
GITHUB_TOKEN: '${{ secrets.GH_TOKEN_BOT_EVE }}'
PR_FILTER: "labelled"
PR_LABELS: "autoupdate"
PR_READY_STATE: "ready_for_review"
MERGE_CONFLICT_ACTION: "ignore"
Loading

0 comments on commit 0b9421a

Please sign in to comment.