File sync from EdgeApp/edge-workflows

EdgeApp · Feb 2, 2022 · 6904062 · 6904062
1 parent 62a1262
commit 6904062
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/.github/workflows/pr-rebase.yml b/.github/workflows/pr-rebase.yml
@@ -8,8 +8,9 @@ jobs:
     if: >-
       github.event.issue.pull_request != '' && 
       (
-        contains(github.event.comment.body, '/rebase') || 
-        contains(github.event.comment.body, '/autosquash')
+        contains(github.event.comment.body, '/autosquash') || 
+        contains(github.event.comment.body, '/fixup') ||
+        contains(github.event.comment.body, '/rebase')
       )
     runs-on: ubuntu-latest
     steps:
@@ -21,6 +22,6 @@ jobs:
       - name: Automatic Rebase
         uses: samholmes/rebase@autosquash
         with:
-          autosquash: ${{ contains(github.event.comment.body, '/autosquash') || contains(github.event.comment.body, '/rebase-autosquash') }}
+          autosquash: ${{ true }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}