From e4367d36d30e1debf4ab1630a6637fa7f01c3858 Mon Sep 17 00:00:00 2001 From: Shawn <44221603+smarshall-spitzbart@users.noreply.github.com> Date: Wed, 13 Sep 2023 12:31:16 -0700 Subject: [PATCH 1/2] update ymls --- .github/dependabot.yml | 10 ++++++++++ .mergify.yml | 8 ++++++++ 2 files changed, 18 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 404825428c..e197c1eab2 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -67,3 +67,13 @@ updates: open-pull-requests-limit: 0 labels: - dependencies + + - package-ecosystem: gomod + directory: "/" + schedule: + interval: daily + target-branch: "release/v3.2.x-consumer" + # 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 226075ed45..cca71d14ea 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -50,3 +50,11 @@ pull_request_rules: backport: branches: - release/v3.1.x + - name: Backport patches to the release/v3.2.x-consumer branch + conditions: + - base=main + - label=A:backport/v3.2.x-consumer + actions: + backport: + branches: + - release/v3.2.x-consumer \ No newline at end of file From 7fb83d190d32bd32531b5a26a10f4f996dc38f6f Mon Sep 17 00:00:00 2001 From: mpoke Date: Thu, 14 Sep 2023 09:52:02 +0200 Subject: [PATCH 2/2] add newline --- .mergify.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.mergify.yml b/.mergify.yml index cca71d14ea..9b6159b9f8 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -57,4 +57,4 @@ pull_request_rules: actions: backport: branches: - - release/v3.2.x-consumer \ No newline at end of file + - release/v3.2.x-consumer