1
0

Обновить .gitea/workflows/automerge-with-core.yaml
All checks were successful
Merge core/template-android-project to this repo / merge-if-needed (push) Has been skipped
Gitea Actions Demo / Explore-Gitea-Actions (push) Successful in 4m16s

This commit is contained in:
Владимир Шперлинг 2024-03-03 19:32:26 +00:00
parent 91d5f3cc77
commit 227440aca0

View File

@ -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 }}."