Java/unit-testing
1
0
Fork 0
Code Issues Pull Requests Actions 1 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:31:42 +00:00
parent ca8a02e9ca
commit 237aa93d5e
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,8 +14,9 @@ jobs:
- 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 }} /repo - run: git clone https://sicampus.ru/gitea/${{ gitea.repository }} /repo
- run: cd /repo - run: |
- run: git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git cd /repo
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
- run: git log - run: git log