From 875ef3ef8d70068ffeca4e93c583a993b2ae0ae3 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: Mon, 4 Mar 2024 18:09:43 +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 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml
index f84a945..5b40022 100644
--- a/.gitea/workflows/automerge-with-core.yaml
+++ b/.gitea/workflows/automerge-with-core.yaml
@@ -12,6 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: echo "Merge core/template-android-project to ${{ gitea.repository }}"
+      - run: git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ secrets.PUSH_TOKEN }}"; }; f'
       - run: |
           git clone https://sicampus.ru/gitea/${{ gitea.repository }}
           git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git
@@ -22,9 +23,7 @@ jobs:
       - run: |
           echo "From other line"
           git log
-      - run: |
-          git config --global credential.helper '!f() { sleep 1; echo "username=vladimir-shperling=${{ secrets.PUSH_TOKEN }}"; }; f'
-          git push --force
+      - run: git push --force
       - 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 }}."