-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #7954 from codeigniter4/revert-7950-confl
Revert "GitHub Actions to add/remove label "stale" and comment"
- Loading branch information
Showing
3 changed files
with
33 additions
and
89 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
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,33 @@ | ||
name: Auto Comment Conflicts | ||
on: | ||
pull_request: | ||
branches: | ||
- 'develop' | ||
- '4.*' | ||
types: | ||
- labeled | ||
|
||
concurrency: | ||
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} | ||
cancel-in-progress: true | ||
|
||
jobs: | ||
auto-comment-conflict: | ||
permissions: | ||
contents: read | ||
pull-requests: write | ||
if: github.event.label.name == 'stale' | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Add comment for PR with conflict | ||
uses: peter-evans/create-or-update-comment@v3 | ||
with: | ||
token: ${{ secrets.GITHUB_TOKEN }} | ||
issue-number: ${{ github.event.pull_request.number }} | ||
body: | | ||
:wave: Hi, @${{ github.event.pull_request.user.login }}! | ||
We detected conflicts in your PR against the base branch :speak_no_evil: | ||
You may want to sync :arrows_counterclockwise: your branch with upstream! | ||
Ref: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#pushing-your-branch |
This file was deleted.
Oops, something went wrong.