From 3833c8613494a5e6abc1f4a60aaf65bd71a00f8f Mon Sep 17 00:00:00 2001 From: Marius Poke Date: Mon, 24 Jun 2024 14:18:11 +0200 Subject: [PATCH] add v18.x to mergify and dependabot (#3155) --- .github/dependabot.yml | 7 +++---- .mergify.yml | 12 ++++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8cba6a111e0..0a719fd47ad 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -21,19 +21,18 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v16.x" + target-branch: "release/v17.2.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: - dependencies - - package-ecosystem: gomod directory: "/" schedule: interval: daily - target-branch: "release/v17.2.x" + target-branch: "release/v18.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: - - dependencies + - dependencies \ No newline at end of file diff --git a/.mergify.yml b/.mergify.yml index c915fe168f1..d3ebbbca751 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -24,20 +24,20 @@ pull_request_rules: {{ title }} (#{{ number }}) {{ body }} - - name: Backport patches to the release/v16.x branch + - name: Backport patches to the release/v17.2.x branch conditions: - base=main - - label=A:backport/v16.x + - label=A:backport/v17.2.x actions: backport: branches: - - release/v16.x + - release/v17.2.x - - name: Backport patches to the release/v17.2.x branch + - name: Backport patches to the release/v18.x branch conditions: - base=main - - label=A:backport/v17.2.x + - label=A:backport/v18.x actions: backport: branches: - - release/v17.2.x + - release/v18.x