diff options
| -rw-r--r-- | .github/workflows/staging-automerge.yaml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/.github/workflows/staging-automerge.yaml b/.github/workflows/staging-automerge.yaml index 3f43d88..101a254 100644 --- a/.github/workflows/staging-automerge.yaml +++ b/.github/workflows/staging-automerge.yaml @@ -15,25 +15,21 @@ jobs: steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 - name: create pr run: | - { - echo 'PR<<EOF' gh pr create \ - --repo ${{ github.repository }} \ --base main \ --head ${{ github.ref_name }} \ --title "auto-merge: ${{ github.ref_name }} -> main" \ --fill - echo EOF - } >> "$GITHUB_ENV" - env: GITHUB_TOKEN: ${{ github.token }} - name: enable auto-merge - run: gh pr merge --auto --rebase "$PR" + run: gh pr merge --auto --rebase --match-head-commit ${{ github.sha }} env: GITHUB_TOKEN: ${{ github.token }} |