From b70643d09a5bbcd72aceb425548f4b4515b056ca Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 7 Oct 2023 11:20:33 -0400
Subject: actions: fix staging-automerge

---
 .github/workflows/staging-automerge.yaml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to '.github/workflows')

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 }}
-- 
cgit v1.2.3