diff --git a/.github/dependabot.yml b/.github/dependabot.yml index e197c1eab2..773e5a783f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -42,7 +42,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v2.1.x-lsm" + target-branch: "release/v2.1.x-provider-lsm" # 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 9b6159b9f8..00764d0a8c 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -26,14 +26,14 @@ pull_request_rules: backport: branches: - release/v2.0.x-lsm - - name: Backport patches to the release/v2.1.x-lsm branch + - name: Backport patches to the release/v2.1.x-provider-lsm branch conditions: - base=main - - label=A:backport/v2.1.x-lsm + - label=A:backport/v2.1.x-provider-lsm actions: backport: branches: - - release/v2.1.x-lsm + - release/v2.1.x-provider-lsm - name: Backport patches to the release/v3.0.x branch conditions: - base=main