feat: github action to check the merge conflict on push #218
Conversation
sambhavgupta0705
requested review from
derberg,
alequetzalli,
fmvilas,
KhudaDad414 and
asyncapi-bot-eve
as code owners
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Welcome to AsyncAPI. Thanks a lot for creating your first pull request. Please check out our contributors guide useful for opening a pull request.
Keep in mind there are also other channels you can use to interact with AsyncAPI community. For more details check out this issue.
|
hey @derberg will require your lot of help in this one. |
| auto-comment-merge-conflicts: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: codytseng/auto-comment-merge-conflicts@v1 |
There was a problem hiding this comment.
| - uses: codytseng/auto-comment-merge-conflicts@v1 | |
| - uses: codytseng/auto-comment-merge-conflicts@d621e322650866ded2c0753ea565dd83a18e01ff #using 1.3 version https://github.com/CodyTseng/auto-comment-merge-conflicts/releases/tag/v1.3.0 |
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.
|
|
||
| on: push | ||
|
|
||
| permissions: |
There was a problem hiding this comment.
why is this needed? we never used it before
| @@ -0,0 +1,18 @@ | |||
| name: Auto Comment Merge Conflicts | |||
|
|
|||
| on: push | |||
There was a problem hiding this comment.
on push to 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?
| - uses: codytseng/auto-comment-merge-conflicts@v1 | ||
| 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?
|
hey @sambhavgupta0705, are you still working on this issue? |
|
Yes @KhudaDad414 ,I was just busy with other work and my exams. |
Description
current PR adds a github actions which will check all the open PR when a push commit is made and will leave a comment if there is a merge conflict.
Related issue(s)
Resolves #181