diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 9e01eb1..5d058dd 100644 --- a/.gitea/workflows/automerge-with-core.yaml +++ b/.gitea/workflows/automerge-with-core.yaml @@ -16,20 +16,11 @@ jobs: - run: echo "Merge core/template-android-project to ${{ gitea.repository }}" - run: | git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ TOKEN }}"; }; f' - 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 clone https://sicampus.ru/gitea/${{ gitea.repository }} + git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git + git fetch upstream + git rebase upstream/main git push --force - echo "OK" - 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 "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."