mirror of
https://github.com/pagefaultgames/pokerogue.git
synced 2025-08-19 13:59:27 +02:00
update
This commit is contained in:
parent
0ae4758bcd
commit
30ab56f190
27
.github/workflows/optimize-assets.yml
vendored
27
.github/workflows/optimize-assets.yml
vendored
@ -20,6 +20,31 @@ jobs:
|
||||
with:
|
||||
fetch-depth: 0
|
||||
|
||||
- name: Merge main branch
|
||||
id: merge_main
|
||||
continue-on-error: true
|
||||
run: |
|
||||
git config --local user.email "github-actions[bot]@users.noreply.github.com"
|
||||
git config --local user.name "github-actions[bot]"
|
||||
git fetch origin main
|
||||
if git merge origin/main --no-edit; then
|
||||
echo "merge_status=success" >> $GITHUB_OUTPUT
|
||||
else
|
||||
echo "merge_status=failed" >> $GITHUB_OUTPUT
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Check merge status
|
||||
if: steps.merge_main.outputs.merge_status == 'failed'
|
||||
run: |
|
||||
echo "合并 main 分支失败,请手动解决冲突"
|
||||
exit 1
|
||||
|
||||
- name: Push merged changes
|
||||
if: steps.merge_main.outputs.merge_status == 'success'
|
||||
run: |
|
||||
git push
|
||||
|
||||
- name: Setup Node.js
|
||||
uses: actions/setup-node@v3
|
||||
with:
|
||||
@ -81,7 +106,7 @@ jobs:
|
||||
fi
|
||||
|
||||
- name: Commit and push if changed
|
||||
if: steps.check_changes.outputs.changes == 'true'
|
||||
if: steps.check_changes.outputs.changes == 'true' && steps.merge_main.outputs.merge_status == 'success'
|
||||
run: |
|
||||
git config --local user.email "github-actions[bot]@users.noreply.github.com"
|
||||
git config --local user.name "github-actions[bot]"
|
||||
|
Loading…
Reference in New Issue
Block a user