Обновить .gitea/workflows/automerge-with-core.yaml
This commit is contained in:
		| @@ -1,6 +1,4 @@ | ||||
| name: Merge core/template-android-project to this repo | ||||
| env: | ||||
|   TOKEN: ${{ secrets.PUSH_TOKEN }} | ||||
|  | ||||
| run-name: Merge core/template-android-project to ${{ gitea.repository }} | ||||
| on:  | ||||
| @@ -15,14 +13,18 @@ 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=${{ TOKEN }}"; }; f' | ||||
|           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 push --force | ||||
|           git log | ||||
|           echo "OK" | ||||
|       - run: | | ||||
|           echo "From other line" | ||||
|           git log | ||||
|       - run: | | ||||
|           git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ secrets.PUSH_TOKEN }}"; }; f' | ||||
|           git push --force | ||||
|       - 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 "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." | ||||
|   | ||||
		Reference in New Issue
	
	Block a user