Revert "ci: use BACKPORT_MERGE_COMMIT option (#16730)" (#17116)

This reverts commit 1721e687c0.

The change was expected to solve the sporadic problems we were having
with Backport Assistant, but it end up creating even more failures.
This commit is contained in:
Luiz Aoqui
2023-05-08 13:30:43 -04:00
committed by GitHub
parent 6155ba3bcf
commit 58a7d40122

View File

@@ -19,7 +19,8 @@ jobs:
env:
BACKPORT_LABEL_REGEXP: "backport/(?P<target>website)"
BACKPORT_TARGET_TEMPLATE: "stable-{{.target}}"
BACKPORT_MERGE_COMMIT: true
# Enabling this option increased the number of backport failures.
BACKPORT_MERGE_COMMIT: false
GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
- name: Backport changes to targeted release branch
run: |
@@ -27,7 +28,8 @@ jobs:
env:
BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+\\.[+\\w]+)"
BACKPORT_TARGET_TEMPLATE: "release/{{.target}}"
BACKPORT_MERGE_COMMIT: true
# Enabling this option increased the number of backport failures.
BACKPORT_MERGE_COMMIT: false
GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
handle-failure:
needs: