Обновить .gitea/workflows/automerge-with-core.yaml
This commit is contained in:
		| @@ -16,18 +16,10 @@ jobs: | ||||
|       - 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' | ||||
|           echo "Cloning Core" | ||||
|           git clone https://sicampus.ru/gitea/core/template-android-project /core | ||||
|           echo "Cloning Repo" | ||||
|           git clone https://sicampus.ru/gitea/${{ gitea.repository }} /repo | ||||
|           cd /repo | ||||
|           echo "Cloning Remote core" | ||||
|           git remote add core /core | ||||
|           echo "Cloning Fetch core" | ||||
|           git fetch core | ||||
|           echo "Cloning Merge core" | ||||
|           git rebase core/main | ||||
|           echo "Cloning Push core" | ||||
|           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 | ||||
|           echo "OK" | ||||
|       - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." | ||||
|   | ||||
		Reference in New Issue
	
	Block a user