Backport of revert backport assistant changes into release/1.0.x (#3061)

backport of commit 72f1b18 Co-authored-by: Curt Bushko <[email protected]>
hashicorp · Oct 7, 2023 · 8e033ad · 8e033ad
1 parent 769ad51
commit 8e033ad
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
@@ -20,8 +20,4 @@ jobs:
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+\\.x)"
           BACKPORT_TARGET_TEMPLATE: "release/{{.target}}"
-          # This forces the backport assistant to backport the merged commit
-          # instead of each commit individually. The environment variable
-          # just needs to exist for this to happen.
-          BACKPORT_MERGE_COMMIT: true
           GITHUB_TOKEN: ${{ secrets.ELEVATED_GITHUB_TOKEN }}