From afc2de68192b3004634284f71ffe0617ed422bb7 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Sun, 27 Apr 2025 10:37:01 +0300 Subject: [PATCH] check sync action Signed-off-by: Vasiliy Tolstov --- .gitea/workflows/job_syncpull.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/job_syncpull.yml b/.gitea/workflows/job_syncpull.yml index b533295d..7692c425 100644 --- a/.gitea/workflows/job_syncpull.yml +++ b/.gitea/workflows/job_syncpull.yml @@ -14,13 +14,19 @@ jobs: run: git clone --bare --filter=tree:0 ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo - name: track master - run: git --git-dir=repo remote add --no-tags --fetch --track master upstream-master ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} + run: | + git --git-dir=repo remote add --no-tags --fetch --track master upstream-master ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} + git --git-dir=repo merge --allow-unrelated-histories "upstream-master/master" - name: track v3 - run: git --git-dir=repo remote add --no-tags --fetch --track v3 upstream-v3 ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} + run: | + git --git-dir=repo remote add --no-tags --fetch --track v3 upstream-v3 ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} + git --git-dir=repo merge --allow-unrelated-histories "upstream-master/v3" - name: track v4 - run: git --git-dir=repo remote add --no-tags --fetch --track v4 upstream-v4 ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} + run: | + git --git-dir=repo remote add --no-tags --fetch --track v4 upstream-v4 ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} + git --git-dir=repo merge --allow-unrelated-histories "upstream-master/v4" - name: push - run: git --git-dir=repo push --progress \ No newline at end of file + run: git --git-dir=repo push --all --progress \ No newline at end of file