From 91137537a29b7de138b3e551d919d22cdefa1eb3 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Sun, 27 Apr 2025 13:23:33 +0300 Subject: [PATCH] check sync action Signed-off-by: Vasiliy Tolstov --- .gitea/workflows/job_syncpull.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitea/workflows/job_syncpull.yml b/.gitea/workflows/job_syncpull.yml index bb53506a..3cce1d34 100644 --- a/.gitea/workflows/job_syncpull.yml +++ b/.gitea/workflows/job_syncpull.yml @@ -22,6 +22,7 @@ jobs: git clone --depth=10 --branch master --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo cd repo git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY} + git pull --rebase upstream master git push -u upstream master git merge --allow-unrelated-histories "upstream/master" git push --progress @@ -33,6 +34,7 @@ jobs: git clone --depth=10 --branch v3 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo cd repo git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY} + git pull --rebase upstream v3 git push -u upstream v3 git merge --allow-unrelated-histories "upstream/v3" git push --progress @@ -44,6 +46,7 @@ jobs: git clone --depth=10 --branch v4 --single-branch ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} repo cd repo git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY} + git pull --rebase upstream v4 git push -u upstream v4 git merge --allow-unrelated-histories "upstream/v4" git push --progress