Skip to content

Commit

Permalink
do not auto merge backports (hashicorp#19694)
Browse files Browse the repository at this point in the history
do not auto merge backport as there is a bug in backport assistant that could merge the entire main into release branches.
  • Loading branch information
dhiaayachi authored and Lord-Y committed Dec 14, 2023
1 parent a07edbc commit 3eb97a8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/backport-assistant.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
steps:
- name: Run Backport Assistant for release branches
run: |
backport-assistant backport -merge-method=squash -gh-automerge
backport-assistant backport -merge-method=squash
env:
BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+)"
BACKPORT_TARGET_TEMPLATE: "release/{{.target}}.x"
Expand Down

0 comments on commit 3eb97a8

Please sign in to comment.