Skip to content

Commit

Permalink
Merge branch 'main' into patch-47
Browse files Browse the repository at this point in the history
  • Loading branch information
faddat authored Sep 25, 2023
2 parents 26b7875 + eb2f5e1 commit 48a766d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ updates:
directory: "/"
schedule:
interval: daily
target-branch: "release/v12.x"
target-branch: "release/v13.x"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
Expand All @@ -31,7 +31,7 @@ updates:
directory: "/"
schedule:
interval: daily
target-branch: "release/v11.x"
target-branch: "release/v12.x"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
Expand All @@ -41,7 +41,7 @@ updates:
directory: "/"
schedule:
interval: daily
target-branch: "release/v10.0.x"
target-branch: "release/v11.x"
# Only allow automated security-related dependency updates on release branches.
open-pull-requests-limit: 0
labels:
Expand Down
18 changes: 9 additions & 9 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,29 @@ pull_request_rules:
{{ title }} (#{{ number }})
{{ body }}
- name: Backport patches to the release/v10.0.x branch
- name: Backport patches to the release/v11.x branch
conditions:
- base=main
- label=A:backport/v10.0.x
- label=A:backport/v11.x
actions:
backport:
branches:
- release/v10.0.x
- release/v11.x

- name: Backport patches to the release/v11.x branch
- name: Backport patches to the release/v12.x branch
conditions:
- base=main
- label=A:backport/v11.x
- label=A:backport/v12.x
actions:
backport:
branches:
- release/v11.x
- release/v12.x

- name: Backport patches to the release/v12.x branch
- name: Backport patches to the release/v13.x branch
conditions:
- base=main
- label=A:backport/v12.x
- label=A:backport/v13.x
actions:
backport:
branches:
- release/v12.x
- release/v13.x

0 comments on commit 48a766d

Please sign in to comment.