From cb1b06e7baedba195a300bcded9ed05a021f4adb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80=20=D0=A8?=
 =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=BB=D0=B8=D0=BD=D0=B3?=
 <vladimir-shperling@yandex.ru>
Date: Sun, 3 Mar 2024 18:03:06 +0000
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?=
 =?UTF-8?q?=D1=8C=20.gitea/workflows/automerge-with-core.yaml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/automerge-with-core.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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