Skip to content

Commit 173a7a6

Browse files
committed
Merge branch 'master' of https://github.com/grpc/grpc into pr-42977
1 parent cfebeb6 commit 173a7a6

210 files changed

Lines changed: 15342 additions & 1129 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/pr-auto-fix.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
with:
2323
format: YYYYWWd
2424
- name: Cache bazel
25-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
25+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
2626
env:
2727
cache-name: bazel-cache
2828
with:
@@ -74,7 +74,7 @@ jobs:
7474
pip install pyyaml mako virtualenv absl-py
7575
pip list
7676
- name: Check out repository code
77-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
77+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
7878
with:
7979
submodules: True
8080
- name: Get the upstream code

.github/workflows/pr-check-bzlmod-deps.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout Repository
21-
uses: actions/checkout@v6
21+
uses: actions/checkout@v7
2222
- name: Set up Python 3.13
2323
uses: actions/setup-python@v6
2424
with:

.github/workflows/publish-to-bcr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020

2121
jobs:
2222
publish:
23-
uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v1.2.0
23+
uses: bazel-contrib/publish-to-bcr/.github/workflows/publish.yaml@v1.4.1
2424
with:
2525
attest: false
2626
# Mark the created PR as ready for review, since it can't be marked ready by gRPC maintainers and subsequently

.github/workflows/push_php_mirror.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout grpc/grpc
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@v7
1414
with:
1515
submodules: recursive
1616

@@ -20,7 +20,7 @@ jobs:
2020
echo "RELEASE_VERSION=${VERSION}" >> $GITHUB_ENV
2121
2222
- name: Clone Mirror Repo
23-
uses: actions/checkout@v4
23+
uses: actions/checkout@v7
2424
with:
2525
repository: grpc/grpc-php-ext
2626
path: mirror

.github/workflows/update-artifacts-branch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v6
16+
uses: actions/checkout@v7
1717
with:
1818
ref: master
1919
fetch-depth: 0

BUILD

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5534,6 +5534,16 @@ grpc_upb_proto_reflection_library(
55345534
deps = ["@envoy_api//envoy/extensions/filters/network/http_connection_manager/v3:pkg"],
55355535
)
55365536

5537+
grpc_upb_proto_library(
5538+
name = "envoy_extensions_filters_http_ext_proc_upb",
5539+
deps = ["@envoy_api//envoy/extensions/filters/http/ext_proc/v3:pkg"],
5540+
)
5541+
5542+
grpc_upb_proto_reflection_library(
5543+
name = "envoy_extensions_filters_http_ext_proc_upbdefs",
5544+
deps = ["@envoy_api//envoy/extensions/filters/http/ext_proc/v3:pkg"],
5545+
)
5546+
55375547
grpc_upb_proto_library(
55385548
name = "envoy_extensions_grpc_service_call_credentials_access_token_upb",
55395549
deps = ["@envoy_api//envoy/extensions/grpc_service/call_credentials/access_token/v3:pkg"],
@@ -5589,6 +5599,11 @@ grpc_upb_proto_reflection_library(
55895599
deps = ["@envoy_api//envoy/service/discovery/v3:pkg"],
55905600
)
55915601

5602+
grpc_upb_proto_library(
5603+
name = "envoy_service_ext_proc_upb",
5604+
deps = ["@envoy_api//envoy/service/ext_proc/v3:pkg"],
5605+
)
5606+
55925607
grpc_upb_proto_library(
55935608
name = "envoy_service_load_stats_upb",
55945609
deps = ["@envoy_api//envoy/service/load_stats/v3:pkg"],

CMakeLists.txt

Lines changed: 493 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Makefile

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Rakefile

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -253,10 +253,7 @@ task 'gem:native', [:plat, :build_type] do |t, args|
253253
unix_platforms.each do |plat|
254254
unless unix_platforms_without_debug_symbols.include?(plat)
255255
`bash src/ruby/nativedebug/build_package.sh #{plat}`
256-
# Native debug gems uploaded to GCS, are copied to ruby-native-debug-symbols for grpc_publish_packages to recognize
257-
target = 'pkg/ruby-native-debug-symbols'
258-
FileUtils.mkdir_p(target)
259-
FileUtils.cp(Dir.glob('src/ruby/nativedebug/pkg/*.gem'), target)
256+
`cp src/ruby/nativedebug/pkg/*.gem pkg/`
260257
end
261258
end
262259
end

0 commit comments

Comments
 (0)