From 079f5a87941890524a559836ef18e3a33fe962e9 Mon Sep 17 00:00:00 2001 From: ligi Date: Sun, 28 Aug 2022 18:02:30 +0200 Subject: [PATCH] Another approach to fix auto rebase (#1513) --- .github/workflows/rebase.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml index 91095ec3..040b5247 100644 --- a/.github/workflows/rebase.yml +++ b/.github/workflows/rebase.yml @@ -13,12 +13,14 @@ jobs: contains(github.event.comment.body, '/autosquash') ) steps: - - name: Checkout the latest code - uses: actions/checkout@v2 - with: - token: ${{ secrets.PAT_TOKEN }} - fetch-depth: 0 # otherwise, you will fail to push refs to dest repo - - name: Automatic Rebase - uses: cirrus-actions/rebase@1.5 - env: - GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} \ No newline at end of file + - name: Checkout the latest code + uses: actions/checkout@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + fetch-depth: 0 # otherwise, you will fail to push refs to dest repo + - name: Automatic Rebase + uses: cirrus-actions/rebase@1.7 + with: + autosquash: ${{ contains(github.event.comment.body, '/autosquash') || contains(github.event.comment.body, '/rebase-autosquash') }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file