Skip to content

Commit 3702a95

Browse files
authored
Merge pull request #122 from NotHimmel/patch-2
Update merge-build-push.yml
2 parents 1cc2027 + 725f18d commit 3702a95

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

.github/workflows/merge-build-push.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Build , Push to web, Deploy Antora Docs
22

33
on:
4-
pull_request:
4+
pull_request_target:
55
types:
66
- closed
77

@@ -96,7 +96,6 @@ jobs:
9696
with:
9797
repository: ${{ github.repository_owner }}/ivorysql_web
9898
path: www_publish_target
99-
token: ${{ secrets.IVORY_TOKEN }}
10099

101100
- name: Setup Ruby and Bundler
102101
uses: ruby/setup-ruby@v1
@@ -178,7 +177,7 @@ jobs:
178177
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 != ''
179178
working-directory: ./www_publish_target
180179
env:
181-
GH_TOKEN: ${{ secrets.IVORY_TOKEN }}
180+
GH_TOKEN: ${{ secrets.WEB_TOKEN }}
182181
PARAM_BASE_BRANCH: master
183182
PARAM_HEAD_BRANCH: ${{ steps.commit_push_new_branch.outputs.new_branch_name }}
184183
PARAM_TITLE: "Docs: Automated update from IvorySQL/ivorysql_docs commit ${{ github.event.head_commit.id || github.sha }}"
@@ -223,7 +222,7 @@ jobs:
223222
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 != ''
224223
working-directory: ./www_publish_target
225224
env:
226-
GH_TOKEN: ${{ secrets.IVORY_TOKEN }}
225+
GH_TOKEN: ${{ secrets.WEB_TOKEN }}
227226
PR_HEAD_BRANCH: ${{ steps.commit_push_new_branch.outputs.new_branch_name }}
228227
PR_BASE_BRANCH: master
229228
MERGE_STRATEGY: MERGE
@@ -236,4 +235,4 @@ jobs:
236235
else
237236
echo "::warning::Failed to enable auto-merge for PR from branch '$PR_HEAD_BRANCH'."
238237
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."
239-
fi
238+
fi

0 commit comments

Comments
 (0)