From 237aa93d5e32c7459c69fe8dc1053c6a8e9ce301 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?= Date: Mon, 4 Mar 2024 18:31:42 +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, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 3e08ec7..56d6ccf 100644 --- a/.gitea/workflows/automerge-with-core.yaml +++ b/.gitea/workflows/automerge-with-core.yaml @@ -14,8 +14,9 @@ jobs: - 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 }} /repo - - run: cd /repo - - run: git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git + - run: | + cd /repo + git remote add upstream https://sicampus.ru/gitea/core/template-android-project.git - run: git fetch upstream - run: git rebase upstream/main - run: git log