Merge pull request #34 from nostr-jp/fix-sync-workflow

Fix sync workflow
nostr-jp · Nov 21, 2023 · 4281480 · 4281480
2 parents d329b5c + b07ad7c
commit 4281480
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -8,25 +8,16 @@ on:
 permissions: {}
 
 jobs:
-  create_token:
+  sync:
     runs-on: ubuntu-latest
-    timeout-minutes: 3
-    outputs:
-      token: ${{ steps.create.outputs.token }}
+    timeout-minutes: 10
     steps:
       - uses: tibdex/github-app-token@v2
-        id: create
+        id: create_token
         with:
           app_id: ${{ secrets.APP_ID }}
           private_key: ${{ secrets.PRIVATE_KEY }}
 
-  sync:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    needs: create_token
-    env:
-      GITHUB_TOKEN: ${{ needs.create_token.outputs.token }}
-    steps:
       - uses: actions/checkout@v4
         with:
           ref: main
@@ -72,13 +63,19 @@ jobs:
             echo "diff_main=0" >> $GITHUB_OUTPUT
             echo "main is in sync with upstream"
           fi
+        env:
+          GITHUB_TOKEN: ${{ steps.create_token.outputs.token }}
 
       - name: Check if sync pull request exists
         id: sync_pr_existence
         run: |
           echo "count=$(gh pr list --head sync --base main | wc -l)" >> $GITHUB_OUTPUT
+        env:
+          GITHUB_TOKEN: ${{ steps.create_token.outputs.token }}
 
       - name: Create pull request if needed
         if: ${{steps.sync_pr_existence.outputs.count == 0 && steps.sync.outputs.diff_main == 1}}
         run: |
           gh pr create --head "sync" --base "main" --title "Sync with upstream" --body ""
+        env:
+          GITHUB_TOKEN: ${{ steps.create_token.outputs.token }}