From 8c416b10ef68e7347d2e62c7bbf5d1abbc3aa7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=B0=D1=81=D0=B8=D0=BB=D0=B8=D0=B9=20=D0=A2=D0=BE?= =?UTF-8?q?=D0=BB=D1=81=D1=82=D0=BE=D0=B2?= Date: Fri, 2 May 2025 18:55:11 +0300 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.github/workflows/job=5Fsync.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/job_sync.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/job_sync.yml b/.github/workflows/job_sync.yml index 519010a..1d1fe4d 100644 --- a/.github/workflows/job_sync.yml +++ b/.github/workflows/job_sync.yml @@ -8,7 +8,7 @@ on: jobs: sync: - if: github.server_url == 'zhttps://github.com' + if: github.server_url != 'https://github.com' runs-on: ubuntu-latest steps: - name: init @@ -24,7 +24,7 @@ jobs: cd repo git remote add --no-tags --fetch --track master upstream https://github.com/${GITHUB_REPOSITORY} git diff --stat master upstream/master - git merge --no-edit --ff-only -v upstream/master + git pull -v --rebase upstream master git push upstream master -v --progress git push origin master -v --progress cd ../ @@ -36,7 +36,7 @@ jobs: cd repo git remote add --no-tags --fetch --track v3 upstream https://github.com/${GITHUB_REPOSITORY} git diff --stat v3 upstream/v3 - git merge --no-edit --ff-only -v upstream/v3 + git pull -v --rebase upstream v3 git push upstream v3 -v --progress git push origin v3 -v --progress cd ../ @@ -48,7 +48,7 @@ jobs: cd repo git remote add --no-tags --fetch --track v4 upstream https://github.com/${GITHUB_REPOSITORY} git diff --stat v4 upstream/v4 - git merge --no-edit --ff-only -v upstream/v4 + git pull -v --rebase upstream v4 git push upstream v4 -v --progress git push origin v4 -v --progress cd ../