From 415288bf44297e4ba7c128b759f91d470576c1b2 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:32: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 | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 56d6ccf..d5f0cdd 100644 --- a/.gitea/workflows/automerge-with-core.yaml +++ b/.gitea/workflows/automerge-with-core.yaml @@ -17,13 +17,22 @@ jobs: - 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 - run: | + cd /repo + git fetch upstream + - run: | + cd /repo + git rebase upstream/main + - run: | + cd /repo + git log + - run: | + cd /repo echo "From other line" git log - - run: git push --force + - run: | + cd /repo + 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 }}."