From d426ffdda836e9820790e9568d5e05dc19309ca3 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:29:36 +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 | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 5b40022..496ac62 100644 --- a/.gitea/workflows/automerge-with-core.yaml +++ b/.gitea/workflows/automerge-with-core.yaml @@ -13,13 +13,11 @@ jobs: 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 - git fetch upstream - git rebase upstream/main - git log - echo "OK" + - run: git clone https://sicampus.ru/gitea/${{ gitea.repository }} + - run: 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 - run: | echo "From other line" git log