mirror of
https://github.com/zumbiepig/MineXLauncher.git
synced 2025-06-08 09:24:48 +00:00
.
This commit is contained in:
parent
8c8c9aa9fd
commit
473afe449c
1
.github/workflows/compile-clients.yml
vendored
1
.github/workflows/compile-clients.yml
vendored
@ -49,6 +49,7 @@ jobs:
|
||||
commit_message: 'github-actions: build and compile clients'
|
||||
commit_author: 'github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>'
|
||||
- name: Merge back with 'dev' branch
|
||||
if: steps.git-auto-commit-action.outputs.changes_detected == 'true'
|
||||
run: |
|
||||
git checkout dev
|
||||
git merge --no-ff ${{ steps.git-auto-commit-action.outputs.commit_hash }}
|
||||
|
Loading…
x
Reference in New Issue
Block a user