diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index 1966d2cc6..cb92a7852 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: