Merge pull request #1589 from pi-hole/master
Sync master back into development
This commit is contained in:
commit
b7c988cc41
|
@ -2,3 +2,5 @@ ssudo
|
|||
tre
|
||||
ede
|
||||
nd
|
||||
requestor
|
||||
requestors
|
|
@ -13,3 +13,17 @@ updates:
|
|||
pull-request-branch-name:
|
||||
# Separate sections of the branch name with a hyphen
|
||||
separator: "-"
|
||||
# As above, but for development-v6
|
||||
- package-ecosystem: github-actions
|
||||
directory: "/"
|
||||
schedule:
|
||||
interval: weekly
|
||||
day: saturday
|
||||
time: "10:00"
|
||||
open-pull-requests-limit: 10
|
||||
target-branch: development-v6
|
||||
reviewers:
|
||||
- "pi-hole/ftl-maintainers"
|
||||
pull-request-branch-name:
|
||||
# Separate sections of the branch name with a hyphen
|
||||
separator: "-"
|
||||
|
|
|
@ -32,8 +32,8 @@ jobs:
|
|||
remove_stale:
|
||||
# trigger "stale" removal immediately when stale issues are commented on
|
||||
# we need to explicitly check that the trigger does not run on comment on a PR as
|
||||
# 'issue_comment' triggers on issues AND PR comments
|
||||
if: github.event_name == 'issue_comment' && ${{ !github.event.issue.pull_request }}
|
||||
# https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#issue_comment-on-issues-only-or-pull-requests-only
|
||||
if: ${{ !github.event.issue.pull_request && github.event_name != 'schedule' }}
|
||||
permissions:
|
||||
contents: read # for actions/checkout
|
||||
issues: write # to edit issues label
|
||||
|
|
Loading…
Reference in New Issue