diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5356217e13..0a55a2d111 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -22,7 +22,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v3.2.x" + target-branch: "release/v4.1.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -32,7 +32,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v3.3.x" + target-branch: "release/v4.1.x-lsm" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -42,7 +42,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v4.0.x" + target-branch: "release/v4.2.x" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -52,17 +52,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v4.1.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/v4.1.x-lsm" + target-branch: "release/v4.2.x-lsm" # Only allow automated security-related dependency updates on release branches. open-pull-requests-limit: 0 labels: @@ -78,12 +68,3 @@ updates: labels: - dependencies - - package-ecosystem: gomod - directory: "/" - schedule: - interval: daily - target-branch: "release/v5.0.x-provider" - # Only allow automated security-related dependency updates on release branches. - open-pull-requests-limit: 0 - labels: - - dependencies diff --git a/.mergify.yml b/.mergify.yml index 11a69816ce..d373fe3fb9 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -10,46 +10,38 @@ queue_rules: - "#approved-reviews-by>1" pull_request_rules: - - name: Backport patches to the release/v3.2.x branch - conditions: - - base=main - - label=A:backport/v3.2.x - actions: - backport: - branches: - - release/v3.2.x - - name: Backport patches to the release/v3.3.x branch + - name: Backport patches to the release/v4.1.x branch conditions: - base=main - - label=A:backport/v3.3.x + - label=A:backport/v4.1.x actions: backport: branches: - - release/v3.3.x - - name: Backport patches to the release/v4.0.x branch + - release/v4.1.x + - name: Backport patches to the release/v4.1.x-lsm branch conditions: - base=main - - label=A:backport/v4.0.x + - label=A:backport/v4.1.x-lsm actions: backport: branches: - - release/v4.0.x - - name: Backport patches to the release/v4.1.x branch + - release/v4.1.x-lsm + - name: Backport patches to the release/v4.2.x branch conditions: - base=main - - label=A:backport/v4.1.x + - label=A:backport/v4.2.x actions: backport: branches: - - release/v4.1.x - - name: Backport patches to the release/v4.1.x-lsm branch + - release/v4.2.x + - name: Backport patches to the release/v4.2.x-lsm branch conditions: - base=main - - label=A:backport/v4.1.x-lsm + - label=A:backport/v4.2.x-lsm actions: backport: branches: - - release/v4.1.x-lsm + - release/v4.2.x-lsm - name: Backport patches to the release/v5.x branch conditions: - base=main @@ -58,11 +50,3 @@ pull_request_rules: 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