Java/unit-testing
1
0
Fork 0
Code Issues Pull Requests Actions Activity

Обновить .gitea/workflows/automerge-with-core.yaml
Some checks failed
Merge core/template-android-project to this repo / merge-if-needed (push) Failing after 4m17s
Details
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 4m18s
Details

Browse Source
This commit is contained in:
Владимир Шперлинг 2024-03-04 18:29:36 +00:00
parent 875ef3ef8d
commit d426ffdda8
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitea/workflows/automerge-with-core.yaml
View File

@ -13,13 +13,11 @@ 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: | - run: git clone https://sicampus.ru/gitea/${{ gitea.repository }}
git clone https://sicampus.ru/gitea/${{ gitea.repository }} - run: git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git
git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git - run: git fetch upstream
git fetch upstream - run: git rebase upstream/main
git rebase upstream/main - run: git log
git log
echo "OK"
- run: | - run: |
echo "From other line" echo "From other line"
git log git log