From 905869bbc372ea3abc15fe978dca782c9d992c17 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Mon, 20 Jul 2026 16:17:51 +0100 Subject: [PATCH 1/2] Add backport label to Dependabot PRs and check docker weekly --- .github/dependabot.yml | 2 +- .github/workflows/auto-merge.yml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9517cc2166..0aaa8733d8 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -29,7 +29,7 @@ updates: - package-ecosystem: "docker" directories: ["/docker/*/"] schedule: - interval: "monthly" + interval: "weekly" # https://blog.yossarian.net/2025/11/21/We-should-all-be-using-dependency-cooldowns cooldown: default-days: 7 diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index a8f9dfe876..5e0e80e5b6 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -15,6 +15,11 @@ jobs: uses: dependabot/fetch-metadata@v3 with: github-token: "${{ secrets.GITHUB_TOKEN }}" + - name: Add backport:skip label + run: gh pr edit --add-label "backport:skip" "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GH_TOKEN: ${{secrets.GITHUB_TOKEN}} - name: Approve a PR run: gh pr review --approve "$PR_URL" env: From d43d2b78937f817d948862cf361689f5d8b29003 Mon Sep 17 00:00:00 2001 From: Sam Bull Date: Mon, 20 Jul 2026 18:37:08 +0100 Subject: [PATCH 2/2] Update auto-merge.yml --- .github/workflows/auto-merge.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 5e0e80e5b6..4c31e90462 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -20,13 +20,3 @@ jobs: env: PR_URL: ${{github.event.pull_request.html_url}} GH_TOKEN: ${{secrets.GITHUB_TOKEN}} - - name: Approve a PR - run: gh pr review --approve "$PR_URL" - env: - PR_URL: ${{github.event.pull_request.html_url}} - GH_TOKEN: ${{secrets.GITHUB_TOKEN}} - - name: Enable auto-merge for Dependabot PRs - run: gh pr merge --auto --squash "$PR_URL" - env: - PR_URL: ${{github.event.pull_request.html_url}} - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}