Обновить .gitea/workflows/automerge-with-core.yaml
This commit is contained in:
		| @@ -17,13 +17,22 @@ jobs: | |||||||
|       - run: | |       - run: | | ||||||
|           cd /repo |           cd /repo | ||||||
|           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 |  | ||||||
|       - run: git rebase upstream/main |  | ||||||
|       - run: git log |  | ||||||
|       - run: | |       - run: | | ||||||
|  |           cd /repo | ||||||
|  |           git fetch upstream | ||||||
|  |       - run: | | ||||||
|  |           cd /repo | ||||||
|  |           git rebase upstream/main | ||||||
|  |       - run: | | ||||||
|  |           cd /repo | ||||||
|  |           git log | ||||||
|  |       - run: | | ||||||
|  |           cd /repo | ||||||
|           echo "From other line" |           echo "From other line" | ||||||
|           git log |           git log | ||||||
|       - run: git push --force |       - run: | | ||||||
|  |           cd /repo | ||||||
|  |           git push --force | ||||||
|       - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event." |       - 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 "🐧 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 }}." |       - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}." | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user