From 58a7d40122885c26608cf928fa91faee21e4fa2b Mon Sep 17 00:00:00 2001 From: Luiz Aoqui Date: Mon, 8 May 2023 13:30:43 -0400 Subject: [PATCH] Revert "ci: use `BACKPORT_MERGE_COMMIT` option (#16730)" (#17116) This reverts commit 1721e687c0832bea3d9b7eec5dcd3c4e7a924d71. The change was expected to solve the sporadic problems we were having with Backport Assistant, but it end up creating even more failures. --- .github/workflows/backport.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 1966d2cc6df0..cb92a7852c4a 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -19,7 +19,8 @@ jobs: env: BACKPORT_LABEL_REGEXP: "backport/(?Pwebsite)" 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\\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: