-
-
Notifications
You must be signed in to change notification settings - Fork 618
feat: auto-close inactive merge-conflicted PRs #1289
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
VanshajPoonia
wants to merge
1
commit into
AOSSIE-Org:main
Choose a base branch
from
VanshajPoonia:feat/stale-merge-conflicted-prs
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+58
−0
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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,58 @@ | ||
| name: Close stale merge-conflicted PRs | ||
|
|
||
| on: | ||
| schedule: | ||
| - cron: "17 2 * * *" | ||
| workflow_dispatch: | ||
|
|
||
| permissions: | ||
| contents: read | ||
| issues: write | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| stale-merge-conflicts: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| steps: | ||
| - name: Warn and close inactive merge-conflicted PRs | ||
| uses: actions/stale@v10 | ||
| with: | ||
| repo-token: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
||
| # Do not process issues. | ||
| days-before-issue-stale: -1 | ||
| days-before-issue-close: -1 | ||
|
|
||
| # Only process PRs that still have unresolved merge conflicts. | ||
| only-pr-labels: "PR has merge conflicts" | ||
|
|
||
| # Warn after 30 inactive days, then close after 5 more inactive days. | ||
| days-before-pr-stale: 30 | ||
| days-before-pr-close: 5 | ||
|
|
||
| # Use a separate stale label so the original merge-conflict label keeps its meaning. | ||
| stale-pr-label: "stale merge conflict" | ||
| close-pr-label: "closed stale merge conflict" | ||
|
|
||
| # If the contributor comments or updates the PR, remove stale state and restart the timer. | ||
| remove-pr-stale-when-updated: true | ||
|
|
||
| # Help process larger backlogs across daily runs. | ||
| operations-per-run: 100 | ||
|
|
||
| stale-pr-message: | | ||
| ⚠️ **This PR still has merge conflicts and has been inactive for 30 days.** | ||
|
|
||
| This PR still has the `PR has merge conflicts` label and there has been no recent activity. | ||
|
|
||
| Please resolve the merge conflicts or leave a comment if you are still working on this PR. | ||
|
|
||
| If there is no activity for 5 more days, this PR may be automatically closed to help maintainers keep the pull request backlog manageable. | ||
|
|
||
| close-pr-message: | | ||
| 🔒 **Closing this PR due to unresolved merge conflicts and inactivity.** | ||
|
|
||
| This PR still had merge conflicts and there was no activity for 5 days after the stale warning. | ||
|
|
||
| You can reopen this PR or create a new one after resolving the merge conflicts. | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.