diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 8c4a22a..ab505df 100644 --- a/.gitea/workflows/automerge-with-core.yaml +++ b/.gitea/workflows/automerge-with-core.yaml @@ -13,9 +13,12 @@ jobs: steps: - run: echo "Merge core/template-android-project to ${{ gitea.repository }}" - run: | + git clone https://sicampus.ru/gitea/core/template-android-project /core git clone https://sicampus.ru/gitea/${{ gitea.repository }} /repo cd /repo - git merge --allow-unrelated-histories https://sicampus.ru/gitea/core/template-android-project + git remote add core /core + git fetch core + git merge --allow-unrelated-histories core/main git log - 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!"