Skip to content

Commit d3d6875

Browse files
authored
Merge pull request #7954 from codeigniter4/revert-7950-confl
Revert "GitHub Actions to add/remove label "stale" and comment"
2 parents 3f5ac0d + 01ba309 commit d3d6875

File tree

3 files changed

+33
-89
lines changed

3 files changed

+33
-89
lines changed

.github/workflows/label-add-conflict.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

.github/workflows/label-conflict.yml

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Auto Comment Conflicts
2+
on:
3+
pull_request:
4+
branches:
5+
- 'develop'
6+
- '4.*'
7+
types:
8+
- labeled
9+
10+
concurrency:
11+
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
auto-comment-conflict:
16+
permissions:
17+
contents: read
18+
pull-requests: write
19+
if: github.event.label.name == 'stale'
20+
runs-on: ubuntu-latest
21+
steps:
22+
- name: Add comment for PR with conflict
23+
uses: peter-evans/create-or-update-comment@v3
24+
with:
25+
token: ${{ secrets.GITHUB_TOKEN }}
26+
issue-number: ${{ github.event.pull_request.number }}
27+
body: |
28+
:wave: Hi, @${{ github.event.pull_request.user.login }}!
29+
30+
We detected conflicts in your PR against the base branch :speak_no_evil:
31+
You may want to sync :arrows_counterclockwise: your branch with upstream!
32+
33+
Ref: https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#pushing-your-branch

.github/workflows/label-remove-conflict.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)