diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml index aa4a2c59c..31863d90d 100644 --- a/.github/workflows/check-pr.yml +++ b/.github/workflows/check-pr.yml @@ -22,6 +22,7 @@ jobs: steps: - uses: peter-evans/close-pull@v1 with: + github-token: ${{ github.token }} delete-branch: false comment: > Thanks for your contribution! Unfortunately we can't accept PRs directed at release branches. We make patches to the bugfix branches and only later do we push them out as releases. diff --git a/.github/workflows/clean-closed.yml b/.github/workflows/clean-closed.yml index 4e85afe4c..befec4498 100644 --- a/.github/workflows/clean-closed.yml +++ b/.github/workflows/clean-closed.yml @@ -19,6 +19,7 @@ jobs: matrix: label: - "S: Don't Merge" + - "S: Hold for 2.1" - "S: Please Merge" - "S: Please Test" - "help wanted" diff --git a/.github/workflows/close-stale.yml b/.github/workflows/close-stale.yml index 89d5d6535..f3fa52d0a 100644 --- a/.github/workflows/close-stale.yml +++ b/.github/workflows/close-stale.yml @@ -20,8 +20,9 @@ jobs: - uses: actions/stale@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - stale-issue-message: 'This issue has had no activity in the last 30 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 7 days.' - days-before-stale: 30 - days-before-close: 7 + stale-issue-message: 'This issue has had no activity in the last 60 days. Please add a reply if you want to keep this issue active, otherwise it will be automatically closed within 10 days.' + days-before-stale: 60 + days-before-close: 10 stale-issue-label: 'stale-closing-soon' - exempt-issue-labels: 'T: Feature Request' + exempt-all-assignees: true + exempt-issue-labels: 'T: Feature Request,Needs: Discussion,Needs: Documentation,Needs: More Data,Needs: Patch,Needs: Work,Needs: Testing,help wanted,no-locking'