feat: use a separate step for enabling the auto-merge of the PRs

tinogo · Dec 4, 2023 · d19bde0 · d19bde0
1 parent aa3b66a
commit d19bde0
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml
@@ -36,6 +36,12 @@ jobs:
         if: ${{ steps.release.outputs.release_created }}
         run: |
           (gh pr --repo $GITHUB_REPOSITORY create --fill --title "chore(main): Merge changes from main into develop" --base develop) || exit 0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Enable auto-merge for the PR
+        if: ${{ steps.release.outputs.release_created }}
+        run: |
           pull_request_url=$(gh pr view release/merge-main-into-develop --json url --jq '. | .url')
           gh pr --repo $GITHUB_REPOSITORY review $pull_request_url --approve
           gh pr --repo $GITHUB_REPOSITORY merge $pull_request_url --auto --merge