Skip to content

Commit

Permalink
Merge pull request #7957 from totoprayogo1916/conflicting
Browse files Browse the repository at this point in the history
Renew: add or remove 'stale' label
  • Loading branch information
kenjis committed Sep 21, 2023
2 parents 0d8064f + 34f1bfd commit 5712e6c
Show file tree
Hide file tree
Showing 3 changed files with 93 additions and 33 deletions.
54 changes: 54 additions & 0 deletions .github/workflows/label-add-conflict.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
name: Auto Add Label "stale" & Comment Conflicts

on:
push:
branches:
- develop
- '4.*'
pull_request:
branches:
- develop
- '4.*'

jobs:
auto-label-comment-conflict:

permissions:
contents: read
pull-requests: write

runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Get PR List
id: PR-list
run: echo "pr_list=$(gh pr list -L 100 --json mergeable,url,labels,author)" >> $GITHUB_OUTPUT
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: 'Add label "stale" and comment'
env:
PR_LIST: ${{ steps.PR-list.outputs.pr_list }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
IFS=$'\n' # Set Internal Field Separator to newline to handle array elements
# Iterate through the PRs in PR_LIST
for pr in $(echo "$PR_LIST" | jq -c '.[]'); do
mergeable=$(echo "$pr" | jq -r '.mergeable')
author=$(echo "$pr" | jq -r '.author.login')
labels=$(echo "$pr" | jq -c '.labels[].name' | tr -d '[]"')
url=$(echo "$pr" | jq -r '.url')
# CONFLICTING and no 'stale' label
if [ "$mergeable" == "CONFLICTING" ] && [[ ! "$labels" == *"stale"* ]]; then
# Add "stale" label
gh pr edit $url --add-label "stale"
# Add a comment
gh pr comment $url --body ":wave: Hi, @$author!<br><br>We detected conflicts in your PR against the base branch :speak_no_evil:<br>You may want to sync :arrows_counterclockwise: your branch with upstream!<br><br>Ref: [Syncing Your Branch](https://github.com/codeigniter4/CodeIgniter4/blob/develop/contributing/workflow.md#pushing-your-branch)"
fi
done
33 changes: 0 additions & 33 deletions .github/workflows/label-conflict.yml

This file was deleted.

39 changes: 39 additions & 0 deletions .github/workflows/label-remove-conflict.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: Auto Remove "stale" label

on:
pull_request:
branches:
- develop
- '4.*'

jobs:
check-conflict:
runs-on: ubuntu-22.04
permissions:
contents: read
pull-requests: write

steps:
- name: Checkout
uses: actions/checkout@v4

- name: Get PR Detail
id: PR-detail
run: echo "detail=$(gh pr view $PR_URL --json mergeable,url,labels,author)" >> $GITHUB_OUTPUT
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_URL: ${{ github.event.pull_request.html_url }}

- name: 'Remove label "stale"'
env:
PR_DETAIL: ${{ steps.PR-detail.outputs.detail }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PR_URL: ${{ github.event.pull_request.html_url }}
run: |
# MERGEABLE with 'stale' label
if [ "$(echo $PR_DETAIL | jq -r '.mergeable')" == "MERGEABLE" ] && \
[ "$(echo $PR_DETAIL | jq -r '.labels[] | select(.name == "stale")')" != "" ]; then
# remove 'stale' label
gh pr edit $PR_URL --remove-label "stale"
fi

0 comments on commit 5712e6c

Please sign in to comment.