From fe5802d598712425022c86dffe4f4f9c08a87cf1 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Tue, 11 Jul 2023 23:53:08 +0100 Subject: [PATCH 1/4] Update dependabot.yml Signed-off-by: Adam Warner --- .github/dependabot.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 55f79c21..6e21b3f7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -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: "-" From 1de5139e316b630f702d5b7021670bdb0d34fc90 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 12 Jul 2023 00:02:33 +0100 Subject: [PATCH 2/4] Read this, added requestor(s) to the ignore list https://oneminuteenglish.org/en/requestor-or-requester/ --- .github/.codespellignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/.codespellignore b/.github/.codespellignore index 48b6bd42..ae149789 100644 --- a/.github/.codespellignore +++ b/.github/.codespellignore @@ -2,3 +2,5 @@ ssudo tre ede nd +requestor +requestors \ No newline at end of file From 02c8692dfd02d6f7361e764a12e78f1ea1611815 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Tue, 11 Jul 2023 23:40:23 +0100 Subject: [PATCH 3/4] Update stale.yml Should fix the conditional Signed-off-by: Adam Warner --- .github/workflows/stale.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 8d8886dd..c3bfceda 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -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 }} permissions: contents: read # for actions/checkout issues: write # to edit issues label From 6795a830f30ac0a523669aed9fb41aed1f0d211f Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Wed, 12 Jul 2023 19:43:23 +0100 Subject: [PATCH 4/4] Tweak conditional, add in missing `env:` Signed-off-by: Adam Warner --- .github/workflows/stale.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index c3bfceda..1946e540 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -33,7 +33,7 @@ jobs: # 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 # 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 }} + if: ${{ !github.event.issue.pull_request && github.event_name != 'schedule' }} permissions: contents: read # for actions/checkout issues: write # to edit issues label