From a09df69ee26bfa4c6e65cb950ec26787575f60aa Mon Sep 17 00:00:00 2001 From: Marius Poke Date: Thu, 11 Jan 2024 15:39:20 +0100 Subject: [PATCH] chore: add v4.0.x to mergify and dependabot (#1562) * add v4.0.x to mergify and dependabot * add new lines --- .github/dependabot.yml | 22 ++++++---------------- .mergify.yml | 24 ++++++++---------------- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index c06758530a..f766b52282 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -28,16 +28,6 @@ updates: labels: - dependencies - - package-ecosystem: gomod - directory: "/" - schedule: - interval: daily - target-branch: "release/v2.0.x-lsm" - # Only allow automated security-related dependency updates on release branches. - open-pull-requests-limit: 0 - labels: - - dependencies - - package-ecosystem: gomod directory: "/" schedule: @@ -47,12 +37,12 @@ updates: open-pull-requests-limit: 0 labels: - dependencies - + - package-ecosystem: gomod directory: "/" schedule: interval: daily - target-branch: "release/v3.0.x" + target-branch: "release/v3.1.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -62,17 +52,17 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v3.1.x" + target-branch: "release/v3.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/v3.2.x" + target-branch: "release/v3.3.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -82,7 +72,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v3.3.x" + target-branch: "release/v4.0.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 b9f995e043..34c1e0c7f6 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -18,14 +18,6 @@ pull_request_rules: backport: branches: - release/v2.0.x - - name: Backport patches to the release/v2.0.x-lsm branch - conditions: - - base=main - - label=A:backport/v2.0.x-lsm - actions: - backport: - branches: - - release/v2.0.x-lsm - name: Backport patches to the release/v2.4.x-lsm branch conditions: - base=main @@ -34,14 +26,6 @@ pull_request_rules: backport: branches: - release/v2.4.x-lsm - - name: Backport patches to the release/v3.0.x branch - conditions: - - base=main - - label=A:backport/v3.0.x - actions: - backport: - branches: - - release/v3.0.x - name: Backport patches to the release/v3.1.x branch conditions: - base=main @@ -66,3 +50,11 @@ pull_request_rules: backport: branches: - release/v3.3.x + - name: Backport patches to the release/v4.0.x branch + conditions: + - base=main + - label=A:backport/v4.0.x + actions: + backport: + branches: + - release/v4.0.x