diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 773e5a783f..3b1bbd1653 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -72,7 +72,7 @@ updates: directory: "/" schedule: interval: daily - target-branch: "release/v3.2.x-consumer" + target-branch: "release/v3.2.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 00764d0a8c..539d0115f2 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -50,11 +50,11 @@ pull_request_rules: backport: branches: - release/v3.1.x - - name: Backport patches to the release/v3.2.x-consumer branch + - name: Backport patches to the release/v3.2.x branch conditions: - base=main - - label=A:backport/v3.2.x-consumer + - label=A:backport/v3.2.x actions: backport: branches: - - release/v3.2.x-consumer + - release/v3.2.x