From 0390e3880a394ff096a92e4d42356affe93b389b 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: Sat, 9 Mar 2024 15:59:53 +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 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.gitea/workflows/automerge-with-core.yaml b/.gitea/workflows/automerge-with-core.yaml index 735b0cb..8f62480 100644 --- a/.gitea/workflows/automerge-with-core.yaml +++ b/.gitea/workflows/automerge-with-core.yaml @@ -21,11 +21,7 @@ jobs: - name: Sync repos uses: Vova-SH/sync-upstream-repo@master with: - mode: branch-to-branch - upstream_repo_url: ${{ env.CORE_REPO }} - upstream_branch: main - downstream_repo_url: https://git.sicampus.ru/${{ gitea.repository }} + upstream_repo: ${{ env.CORE_REPO }} token: ${{ env.TOKEN }} - merge_strategy: rebase spawn_logs: true \ No newline at end of file