Обновить .gitea/workflows/automerge-with-core.yaml
This commit is contained in:
parent
d426ffdda8
commit
ca8a02e9ca
@ -13,7 +13,8 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- run: echo "Merge core/template-android-project to ${{ gitea.repository }}"
|
- run: echo "Merge core/template-android-project to ${{ gitea.repository }}"
|
||||||
- run: git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ secrets.PUSH_TOKEN }}"; }; f'
|
- run: git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ secrets.PUSH_TOKEN }}"; }; f'
|
||||||
- run: git clone https://sicampus.ru/gitea/${{ gitea.repository }}
|
- run: git clone https://sicampus.ru/gitea/${{ gitea.repository }} /repo
|
||||||
|
- run: cd /repo
|
||||||
- run: git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git
|
- run: git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git
|
||||||
- run: git fetch upstream
|
- run: git fetch upstream
|
||||||
- run: git rebase upstream/main
|
- run: git rebase upstream/main
|
||||||
|
Loading…
x
Reference in New Issue
Block a user