From 604ad9cd9d51eddbff5a673e23dcff6dc5150ca6 Mon Sep 17 00:00:00 2001 From: Vasiliy Tolstov Date: Sun, 27 Apr 2025 13:36:11 +0300 Subject: [PATCH] check sync action Signed-off-by: Vasiliy Tolstov --- .gitea/workflows/job_syncpull.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/job_syncpull.yml b/.gitea/workflows/job_syncpull.yml index 3cce1d34..095d7f09 100644 --- a/.gitea/workflows/job_syncpull.yml +++ b/.gitea/workflows/job_syncpull.yml @@ -23,9 +23,9 @@ jobs: 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 push upstream master --progress git merge --allow-unrelated-histories "upstream/master" - git push --progress + git push origin master --progress cd ../ rm -rf repo @@ -35,9 +35,9 @@ jobs: 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 push upstream v3 git merge --allow-unrelated-histories "upstream/v3" - git push --progress + git push origin v3 --progress cd ../ rm -rf repo @@ -47,8 +47,8 @@ jobs: 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 push upstream v4 git merge --allow-unrelated-histories "upstream/v4" - git push --progress + git push origin v4 --progress cd ../ rm -rf repo