diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 98c0966..04316a7 100644 --- a/.gitea/workflows/automerge-with-core.yaml +++ b/.gitea/workflows/automerge-with-core.yaml @@ -13,12 +13,18 @@ jobs: steps: - run: echo "Merge core/template-android-project to ${{ gitea.repository }}" - run: | + 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 merge --allow-unrelated-histories core/main + echo "Cloning Push core" git push origin main --force echo "OK" - run: echo "🎉 The job was automatically triggered by a ${{ gitea.event_name }} event."