Обновить .gitea/workflows/automerge-with-core.yaml
This commit is contained in:
		| @@ -16,20 +16,11 @@ jobs: | |||||||
|       - run: echo "Merge core/template-android-project to ${{ gitea.repository }}" |       - run: echo "Merge core/template-android-project to ${{ gitea.repository }}" | ||||||
|       - run: | |       - run: | | ||||||
|           git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ TOKEN }}"; }; f' |           git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ TOKEN }}"; }; f' | ||||||
|           echo "Cloning Core" |           git clone https://sicampus.ru/gitea/${{ gitea.repository }} | ||||||
|           git clone https://sicampus.ru/gitea/core/template-android-project /core |           git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git | ||||||
|           echo "Cloning Repo" |           git fetch upstream | ||||||
|           git clone https://sicampus.ru/gitea/${{ gitea.repository }} /repo |           git rebase upstream/main | ||||||
|           cd /repo |  | ||||||
|           echo "Cloning Remote core" |  | ||||||
|           git remote add core /core |  | ||||||
|           echo "Cloning Fetch core" |  | ||||||
|           git fetch core |  | ||||||
|           echo "Cloning Merge core" |  | ||||||
|           git merge --allow-unrelated-histories core/main |  | ||||||
|           echo "Cloning Push core" |  | ||||||
|           git push --force |           git push --force | ||||||
|           echo "OK" |  | ||||||
|       - 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