Skip to content

Commit 232dceb

Browse files
veblushcopybara-github
authored andcommitted
[Dep] Small changes to how to pull in Protobuf (grpc#38884)
Two changes are made to accept upcoming Protobuf v30 - Protobuf v30 will introduce a change that removes Bazel+MSVC support unless the `protobuf_allow_msvc option` is explicitly enabled. Therefore, to maintain compatibility, CI needs to define this option. - CMake file for `protobuf/upb` now depends on the `protobuf_VERSION` variable, which is set in the main protobuf CMake file. A specific `cmake_externalproject` test includes `protobuf/upb` directly and therefore misses the opportunity to define this variable. To address this, the test now defines `protobuf_VERSION` directly. Closes grpc#38884 COPYBARA_INTEGRATE_REVIEW=grpc#38884 from veblush:protobuf-v30-misc fd01544 PiperOrigin-RevId: 732251635
1 parent 32a333d commit 232dceb

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

examples/cpp/helloworld/cmake_externalproject/CMakeLists.txt

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tools/internal_ci/windows/bazel_rbe.bat

+9-1
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,12 @@ bazel --version
3535

3636
python3 tools/run_tests/python_utils/bazel_report_helper.py --report_path bazel_rbe
3737

38-
call bazel_rbe/bazel_wrapper.bat --bazelrc=tools/remote_build/windows.bazelrc --output_user_root=T:\_bazel_output test %BAZEL_FLAGS% -- //test/... || exit /b 1
38+
call bazel_rbe/bazel_wrapper.bat ^
39+
--bazelrc=tools/remote_build/windows.bazelrc ^
40+
--output_user_root=T:\_bazel_output ^
41+
test ^
42+
%BAZEL_FLAGS% ^
43+
--define=protobuf_allow_msvc=true ^
44+
-- ^
45+
//test/... ^
46+
|| exit /b 1

0 commit comments

Comments
 (0)