Обновить .gitea/workflows/automerge-with-core.yaml
This commit is contained in:
parent
875ef3ef8d
commit
d426ffdda8
@ -13,13 +13,11 @@ jobs:
|
||||
steps:
|
||||
- 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 clone https://sicampus.ru/gitea/${{ gitea.repository }}
|
||||
git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git
|
||||
git fetch upstream
|
||||
git rebase upstream/main
|
||||
git log
|
||||
echo "OK"
|
||||
- run: git clone https://sicampus.ru/gitea/${{ gitea.repository }}
|
||||
- run: git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git
|
||||
- run: git fetch upstream
|
||||
- run: git rebase upstream/main
|
||||
- run: git log
|
||||
- run: |
|
||||
echo "From other line"
|
||||
git log
|
||||
|
Loading…
x
Reference in New Issue
Block a user