From 17bcd0b0ab21d0d550d8b3a5fa70f1f9f4344d42 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Sun, 27 Apr 2025 12:37:17 +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 e2adee24..caadfd86 100644 --- a/.gitea/workflows/job_syncpull.yml +++ b/.gitea/workflows/job_syncpull.yml @@ -21,6 +21,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 push upstream master git merge --allow-unrelated-histories "upstream/master" git push --progress cd ../ @@ -31,6 +32,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 push upstream v3 git merge --allow-unrelated-histories "upstream/v3" git push --progress cd ../ @@ -41,6 +43,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 push upstream v4 git merge --allow-unrelated-histories "upstream/v4" git push --progress cd ../