From 3bb8ec0753fe60c36c2978c4f70cf2c91b462b53 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: Thu, 1 May 2025 22:07:43 +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 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/job_sync.yml b/.github/workflows/job_sync.yml index e990085..519010a 100644 --- a/.github/workflows/job_sync.yml +++ b/.github/workflows/job_sync.yml @@ -23,6 +23,7 @@ jobs: git clone --filter=blob:none --filter=tree:0 --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 diff --stat master upstream/master git merge --no-edit --ff-only -v upstream/master git push upstream master -v --progress git push origin master -v --progress @@ -34,6 +35,7 @@ jobs: git clone --filter=blob:none --filter=tree:0 --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 diff --stat v3 upstream/v3 git merge --no-edit --ff-only -v upstream/v3 git push upstream v3 -v --progress git push origin v3 -v --progress @@ -45,6 +47,7 @@ jobs: git clone --filter=blob:none --filter=tree:0 --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 diff --stat v4 upstream/v4 git merge --no-edit --ff-only -v upstream/v4 git push upstream v4 -v --progress git push origin v4 -v --progress