feat: github action to check the merge conflict on push #218
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,18 @@ | ||||||
| name: Auto Comment Merge Conflicts | ||||||
|
|
||||||
| on: push | ||||||
|
|
||||||
| permissions: | ||||||
|
There was a problem hiding this comment. why is this needed? we never used it before |
||||||
| pull-requests: write | ||||||
|
|
||||||
| jobs: | ||||||
| auto-comment-merge-conflicts: | ||||||
| runs-on: ubuntu-latest | ||||||
| steps: | ||||||
| - uses: codytseng/auto-comment-merge-conflicts@v1 | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. we should always try to use commitId from actions that do not belong to GitHub itself, for security reason. |
||||||
| with: | ||||||
| token: ${{ secrets.GITHUB_TOKEN }} | ||||||
| comment-body: "Hey there 👋🏼, your current PR has some merge conflicts. KIndly try to resolve them in your local fork and push the new changes." | ||||||
|
There was a problem hiding this comment. maybe we could give some hints? instructions? or maybe even action could figure that if conflict is with package-lock, what are the options to solve it? |
||||||
| wait-ms: 3000 | ||||||
| max-retries: 5 | ||||||
| ignore-authors: asyncapi-bot,dependabot[bot],dependabot-preview[bot],allcontributors | ||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
on
pushto where? remember in AsyncAPI contributor make a push to the fork, will this action know that it runs in the scope of a fork but must place a comment in the upstream repository?