diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 1504a33..50b3cd6 100644 --- a/.gitea/workflows/automerge-with-core.yaml +++ b/.gitea/workflows/automerge-with-core.yaml @@ -11,7 +11,12 @@ jobs: if: ${{ !contains(gitea.repository, 'core/template-android-project' ) }} runs-on: ubuntu-latest steps: - - run: echo "🎉 !contains('core/template-android-project', ${{ gitea.repository }})." + - run: echo "Merge core/template-android-project to ${{ gitea.repository }}" + - run: >- + git clone https://sicampus.ru/gitea/${{ gitea.repository }} /repo + cd repo + git merge --allow-unrelated-histories https://sicampus.ru/gitea/core/template-android-project/${{ gitea.ref }} + 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!" - run: echo "🔎 The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."