From c5d8ff67a78d6b1d48b6e9596f7dca4bf641c466 Mon Sep 17 00:00:00 2001 From: mpoke Date: Thu, 19 Sep 2024 07:47:38 +0200 Subject: [PATCH] add v4.5.x to dependabot and mergify --- .github/dependabot.yml | 14 ++------------ .mergify.yml | 20 ++++++-------------- 2 files changed, 8 insertions(+), 26 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 56a8733ad2..be5f83b1e1 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -22,7 +22,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v4.3.x" + target-branch: "release/v4.0.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -32,17 +32,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v4.3.x-lsm" - # 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/v4.4.x" + target-branch: "release/v4.5.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: diff --git a/.mergify.yml b/.mergify.yml index a82df6082b..7f77c57b73 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,30 +10,22 @@ queue_rules: - "#approved-reviews-by>1" pull_request_rules: - - name: Backport patches to the release/v4.3.x branch + - name: Backport patches to the release/v4.0.x branch conditions: - base=main - - label=A:backport/v4.3.x + - label=A:backport/v4.0.x actions: backport: branches: - - release/v4.3.x - - name: Backport patches to the release/v4.3.x-lsm branch + - release/v4.0.x + - name: Backport patches to the release/v4.5.x branch conditions: - base=main - - label=A:backport/v4.3.x-lsm + - label=A:backport/v4.5.x actions: backport: branches: - - release/v4.3.x-lsm - - name: Backport patches to the release/v4.4.x branch - conditions: - - base=main - - label=A:backport/v4.4.x - actions: - backport: - branches: - - release/v4.4.x + - release/v4.5.x - name: Backport patches to the release/v5.x branch conditions: - base=main