From bd04f5b9cbb2980d2c12671b0727de41bf10ec36 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 21:58:56 +0300 Subject: [PATCH 1/6] =?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 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/job_sync.yml b/.github/workflows/job_sync.yml index ad2db1e..e990085 100644 --- a/.github/workflows/job_sync.yml +++ b/.github/workflows/job_sync.yml @@ -23,9 +23,9 @@ 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 merge upstream/master - git push upstream master --progress - git push origin master --progress + git merge --no-edit --ff-only -v upstream/master + git push upstream master -v --progress + git push origin master -v --progress cd ../ rm -rf repo @@ -34,9 +34,9 @@ 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 merge upstream/v3 - git push upstream v3 --progress - git push origin v3 --progress + git merge --no-edit --ff-only -v upstream/v3 + git push upstream v3 -v --progress + git push origin v3 -v --progress cd ../ rm -rf repo @@ -45,8 +45,8 @@ 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 merge upstream/v4 - git push upstream v4 --progress - git push origin v4 --progress + git merge --no-edit --ff-only -v upstream/v4 + git push upstream v4 -v --progress + git push origin v4 -v --progress cd ../ rm -rf repo From 498218912cda17252aeac80735e123da30a10863 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 21:59:18 +0300 Subject: [PATCH 2/6] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/job_sync.yml b/.github/workflows/job_sync.yml index e990085..bbd4a62 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 From 27bca35eb645c6ccb1938b08a3b25f53112285aa 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:01:33 +0300 Subject: [PATCH 3/6] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/job_sync.yml b/.github/workflows/job_sync.yml index bbd4a62..e990085 100644 --- a/.github/workflows/job_sync.yml +++ b/.github/workflows/job_sync.yml @@ -8,7 +8,7 @@ on: jobs: sync: - if: github.server_url != 'https://github.com' + if: github.server_url == 'zhttps://github.com' runs-on: ubuntu-latest steps: - name: init 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 4/6] =?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 From d3c2ae5f54064adebd35ec0f86b71cf5666a4150 Mon Sep 17 00:00:00 2001 From: pugnack Date: Fri, 2 May 2025 20:51:30 +0500 Subject: [PATCH 5/6] convert headers to HTTP/2 format before SendHeader() (#273) --- grpc.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grpc.go b/grpc.go index 71d7af1..056a6e1 100644 --- a/grpc.go +++ b/grpc.go @@ -399,7 +399,7 @@ func (g *Server) processRequest(ctx context.Context, stream grpc.ServerStream, s // execute the handler appErr := fn(ctx, r, replyv.Interface()) if md := getResponseMetadata(ctx); len(md) > 0 { - if err = stream.SendHeader(gmetadata.MD(md)); err != nil { + if err = stream.SendHeader(md.AsHTTP2()); err != nil { return err } } @@ -483,7 +483,7 @@ func (g *Server) processStream(ctx context.Context, stream grpc.ServerStream, se appErr := fn(ctx, r, ss) if md := getResponseMetadata(ctx); len(md) > 0 { - if err := stream.SendHeader(gmetadata.MD(md)); err != nil { + if err := stream.SendHeader(md.AsHTTP2()); err != nil { return err } } 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 6/6] =?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 ../