diff --git a/.github/workflows/merge-build-push.yml b/.github/workflows/merge-build-push.yml index f28a8b9..c367521 100644 --- a/.github/workflows/merge-build-push.yml +++ b/.github/workflows/merge-build-push.yml @@ -1,7 +1,7 @@ name: Build , Push to web, Deploy Antora Docs on: - pull_request: + pull_request_target: types: - closed @@ -96,7 +96,6 @@ jobs: with: repository: ${{ github.repository_owner }}/ivorysql_web path: www_publish_target - token: ${{ secrets.IVORY_TOKEN }} - name: Setup Ruby and Bundler uses: ruby/setup-ruby@v1 @@ -178,7 +177,7 @@ jobs: if: steps.commit_push_new_branch.outputs.push_pr == 'true' && steps.commit_push_new_branch.outputs.changes_detected == 'true' && steps.commit_push_new_branch.outputs.new_branch_name != '' working-directory: ./www_publish_target env: - GH_TOKEN: ${{ secrets.IVORY_TOKEN }} + GH_TOKEN: ${{ secrets.WEB_TOKEN }} PARAM_BASE_BRANCH: master PARAM_HEAD_BRANCH: ${{ steps.commit_push_new_branch.outputs.new_branch_name }} PARAM_TITLE: "Docs: Automated update from IvorySQL/ivorysql_docs commit ${{ github.event.head_commit.id || github.sha }}" @@ -223,7 +222,7 @@ jobs: if: steps.cpr.outcome == 'success' && steps.commit_push_new_branch.outputs.push_pr == 'true' && steps.commit_push_new_branch.outputs.changes_detected == 'true' && steps.commit_push_new_branch.outputs.new_branch_name != '' working-directory: ./www_publish_target env: - GH_TOKEN: ${{ secrets.IVORY_TOKEN }} + GH_TOKEN: ${{ secrets.WEB_TOKEN }} PR_HEAD_BRANCH: ${{ steps.commit_push_new_branch.outputs.new_branch_name }} PR_BASE_BRANCH: master MERGE_STRATEGY: MERGE @@ -236,4 +235,4 @@ jobs: else echo "::warning::Failed to enable auto-merge for PR from branch '$PR_HEAD_BRANCH'." echo "This might be because the PR is not mergeable (e.g., has conflicts, is a draft PR), requires reviews, auto-merge is already enabled, or the PR could not be uniquely identified by branch name." - fi \ No newline at end of file + fi