diff --git a/.github/workflows/changelog-pr.yaml b/.github/workflows/changelog-pr.yaml index ec4d7d7..3b105b6 100644 --- a/.github/workflows/changelog-pr.yaml +++ b/.github/workflows/changelog-pr.yaml @@ -21,9 +21,16 @@ jobs: id: generate-token uses: actions/create-github-app-token@v1 with: - app-id: ${{ vars.APP_ID }} + app-id: ${{ secrets.APP_ID }} private-key: ${{ secrets.APP_PRIVATE_KEY }} + - name: Generate a token + id: generate-token-merge + uses: actions/create-github-app-token@v1 + with: + app-id: ${{ secrets.APP_ID_APPROVE_AND_MERGE }} + private-key: ${{ secrets.APP_KEY_APPROVE_AND_MERGE }} + - name: Checkout code uses: actions/checkout@v4 with: @@ -261,12 +268,15 @@ jobs: gh pr review $PR_NUMBER --approve fi - - name: Re-approve pull request after update + - name: Approve pull request and merge if: env.changed == 'true' env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ steps.generate-token-merge.outputs.token }} run: | + git config --global user.name "github-actions-automege[bot]" + git config --global user.email "github-actions-automege[bot]@users.noreply.github.com" PR_NUMBER=$(gh pr list --head "${BRANCH_NAME}" --json number --jq '.[].number') if [ -n "$PR_NUMBER" ]; then gh pr review $PR_NUMBER --approve + gh pr merge $PR_NUMBER --squash --admin fi