diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e588557500..5356217e13 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -22,7 +22,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v2.0.x" + target-branch: "release/v3.2.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -32,27 +32,17 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v2.4.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/v3.1.x" + target-branch: "release/v3.3.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/v4.0.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -62,7 +52,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v3.3.x" + target-branch: "release/v4.1.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -72,7 +62,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v4.0.x" + target-branch: "release/v4.1.x-lsm" # 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/v4.1.x" + target-branch: "release/v5.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -92,8 +82,8 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v4.1.x-lsm" + target-branch: "release/v5.0.x-provider" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: - - dependencies \ No newline at end of file + - dependencies diff --git a/.mergify.yml b/.mergify.yml index 1c0a6bb81a..11a69816ce 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,30 +10,6 @@ queue_rules: - "#approved-reviews-by>1" pull_request_rules: - - name: Backport patches to the release/v2.0.x branch - conditions: - - base=main - - label=A:backport/v2.0.x - actions: - backport: - branches: - - release/v2.0.x - - name: Backport patches to the release/v2.4.x-lsm branch - conditions: - - base=main - - label=A:backport/v2.4.x-lsm - actions: - backport: - branches: - - release/v2.4.x-lsm - - name: Backport patches to the release/v3.1.x branch - conditions: - - base=main - - label=A:backport/v3.1.x - actions: - backport: - branches: - - release/v3.1.x - name: Backport patches to the release/v3.2.x branch conditions: - base=main @@ -73,4 +49,20 @@ pull_request_rules: actions: backport: branches: - - release/v4.1.x-lsm \ No newline at end of file + - release/v4.1.x-lsm + - name: Backport patches to the release/v5.x branch + conditions: + - base=main + - label=A:backport/v5.x + actions: + backport: + branches: + - release/v5.x + - name: Backport patches to the release/v5.0.x-provider branch + conditions: + - base=main + - label=A:backport/v5.0.x-provider + actions: + backport: + branches: + - release/v5.0.x-provider