From a6c90879e06be1f3b7c5525d6222fb1d04f597a0 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 7 Oct 2023 11:12:23 -0400
Subject: actions: handle GITHUB_TOKEN in staging-automerge

---
 .github/workflows/staging-automerge.yaml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to '.github/workflows')

diff --git a/.github/workflows/staging-automerge.yaml b/.github/workflows/staging-automerge.yaml
index 70aa4c4..5894388 100644
--- a/.github/workflows/staging-automerge.yaml
+++ b/.github/workflows/staging-automerge.yaml
@@ -5,17 +5,19 @@ on:
     branches: ["staging"]
   workflow_dispatch:
 
-permissions:
-  contents: write
-  pull-requests: write
-
 jobs:
   automerge:
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: write
+      pull-requests: write
+
+    env:
+      GITHUB_TOKEN: ${{ github.token }}
+
     steps:
-      - name: create-pr
-        id: pr
+      - name: create pr
         run: |
           {
             echo 'PR<<EOF'
@@ -30,5 +32,3 @@ jobs:
 
       - name: enable auto-merge
         run: gh pr merge --auto --rebase "$PR"
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-- 
cgit v1.2.3