Skip to content

Commit

Permalink
Merge pull request #7954 from codeigniter4/revert-7950-confl
Browse files Browse the repository at this point in the history
Revert "GitHub Actions to add/remove label "stale" and comment"
  • Loading branch information
kenjis authored Sep 20, 2023
2 parents 3f5ac0d + 01ba309 commit d3d6875
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 89 deletions.
53 changes: 0 additions & 53 deletions .github/workflows/label-add-conflict.yml

This file was deleted.

33 changes: 33 additions & 0 deletions .github/workflows/label-conflict.yml
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
36 changes: 0 additions & 36 deletions .github/workflows/label-remove-conflict.yml

This file was deleted.

0 comments on commit d3d6875

Please sign in to comment.