Обновить .gitea/workflows/automerge-with-core.yaml
This commit is contained in:
parent
e98cc7006b
commit
433faee754
@ -13,9 +13,12 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- run: echo "Merge core/template-android-project to ${{ gitea.repository }}"
|
- run: echo "Merge core/template-android-project to ${{ gitea.repository }}"
|
||||||
- run: |
|
- run: |
|
||||||
|
git clone https://sicampus.ru/gitea/core/template-android-project /core
|
||||||
git clone https://sicampus.ru/gitea/${{ gitea.repository }} /repo
|
git clone https://sicampus.ru/gitea/${{ gitea.repository }} /repo
|
||||||
cd /repo
|
cd /repo
|
||||||
git merge --allow-unrelated-histories https://sicampus.ru/gitea/core/template-android-project
|
git remote add core /core
|
||||||
|
git fetch core
|
||||||
|
git merge --allow-unrelated-histories core/main
|
||||||
git log
|
git log
|
||||||
- run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
|
- run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."
|
||||||
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
|
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by Gitea!"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user