From 9d12e5d891713881396c407ab8a9088fde920e2d Mon Sep 17 00:00:00 2001 From: mpoke Date: Tue, 13 Jun 2023 09:56:20 +0200 Subject: [PATCH 1/2] update mergify --- .mergify.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/.mergify.yml b/.mergify.yml index 28c0186619d..5de6010b1f4 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -24,24 +24,14 @@ pull_request_rules: {{ title }} (#{{ number }}) {{ body }} - - name: Backport patches to the release/v8.0.x branch + - name: Backport patches to the release/v9.1.x branch conditions: - base=main - - label=A:backport/v8.0.x - - "#commits-unverified>=0" + - label=A:backport/v9.1.x actions: backport: branches: - - release/v8.0.x - - - name: Backport patches to the release/v9.0.x branch - conditions: - - base=main - - label=A:backport/v9.0.x - actions: - backport: - branches: - - release/v9.0.x + - release/v9.1.x - name: Backport patches to the release/v10.0.x branch conditions: From 15963287f77d241b1a7c38a370e7c53063788f05 Mon Sep 17 00:00:00 2001 From: mpoke Date: Tue, 13 Jun 2023 09:56:35 +0200 Subject: [PATCH 2/2] update dependabot --- .github/dependabot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 426ba839068..576bda07bb7 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -21,7 +21,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v9.0.x" + target-branch: "release/v10.0.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -31,7 +31,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v8.0.x" + target-branch: "release/v9.1.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: