mirror of
https://gitee.com/huanghongxun/HMCL-docs.git
synced 2025-11-05 05:34:25 +08:00
构建前执行分支合并 (#320)
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
This commit is contained in:
parent
70ba60e045
commit
df53ff9f4f
13
.github/workflows/pr-preview.yml
vendored
13
.github/workflows/pr-preview.yml
vendored
@ -192,12 +192,17 @@ jobs:
|
|||||||
outputs:
|
outputs:
|
||||||
artifact-id: ${{ steps.upload-site.outputs.artifact-id }}
|
artifact-id: ${{ steps.upload-site.outputs.artifact-id }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout PR
|
- name: Checkout
|
||||||
uses: actions/checkout@v5
|
uses: actions/checkout@v5
|
||||||
with:
|
with:
|
||||||
ref: ${{ needs.preview-create-init.outputs.sha }}
|
fetch-depth: 0
|
||||||
repository: ${{ needs.preview-create-init.outputs.repository }}
|
- name: Merge PR
|
||||||
fetch-depth: 1
|
run: |
|
||||||
|
git config user.name "github-actions[bot]"
|
||||||
|
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
|
||||||
|
git fetch https://github.com/${{ needs.preview-create-init.outputs.repository }} ${{ needs.preview-create-init.outputs.sha }}
|
||||||
|
git merge --squash ${{ needs.preview-create-init.outputs.sha }} --no-edit
|
||||||
|
git commit -m "Merge #${{ env.GITHUB_PR_NUMBER }} for preview build"
|
||||||
- name: Setup Ruby
|
- name: Setup Ruby
|
||||||
uses: ruby/setup-ruby@v1
|
uses: ruby/setup-ruby@v1
|
||||||
with:
|
with:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user