@@ -219,13 +219,17 @@ tasks:
219219 - " --enable_workspace"
220220 - " --keep_going"
221221 - " --build_tag_filters=-integration-test"
222+ - " --cxxopt=/std=c++17"
223+ - " --host_cxxopt=/std=c++17"
222224 test_targets :
223225 - " --"
224226 - " ..."
225227 test_flags :
226228 - " --noenable_bzlmod"
227229 - " --enable_workspace"
228230 - " --test_tag_filters=-integration-test"
231+ - " --cxxopt=/std=c++17"
232+ - " --host_cxxopt=/std=c++17"
229233
230234 debian :
231235 << : *reusable_config
@@ -337,6 +341,7 @@ tasks:
337341 bazel : 7.x
338342 integration_test_bzlmod_ubuntu_vendor :
339343 << : *reusable_build_test_all
344+ << : *bazel_7_cxx_17_flags
340345 name : " examples/bzlmod: bazel vendor"
341346 working_directory : examples/bzlmod
342347 platform : ubuntu2204
@@ -361,12 +366,17 @@ tasks:
361366 bazel : last_rc
362367 integration_test_bzlmod_windows :
363368 << : *reusable_build_test_all
364- << : *bazel_7_cxx_17_flags
365369 # coverage is not supported on Windows
366370 name : " examples/bzlmod: Windows"
367371 working_directory : examples/bzlmod
368372 platform : windows
369373 bazel : 7.x
374+ build_flags :
375+ - " --cxxopt=/std=c++17"
376+ - " --host_cxxopt=/std=c++17"
377+ test_flags :
378+ - " --cxxopt=/std=c++17"
379+ - " --host_cxxopt=/std=c++17"
370380 integration_test_bzlmod_windows_upcoming :
371381 << : *reusable_build_test_all
372382 # coverage is not supported on Windows
@@ -534,6 +544,20 @@ tasks:
534544 name : " examples/py_proto_library: Windows, workspace"
535545 working_directory : examples/py_proto_library
536546 platform : windows
547+ test_flags :
548+ - " --noenable_bzlmod"
549+ - " --enable_workspace"
550+ - " --test_tag_filters=-integration-test"
551+ # recent protobuf and abseil-cpp requires C++17 which is not used by default in Bazel 7
552+ - " --cxxopt=/std=c++17"
553+ - " --host_cxxopt=/std=c++17"
554+ build_flags :
555+ - " --noenable_bzlmod"
556+ - " --enable_workspace"
557+ - " --build_tag_filters=-integration-test"
558+ # recent protobuf and abseil-cpp requires C++17 which is not used by default in Bazel 7
559+ - " --cxxopt=/std=c++17"
560+ - " --host_cxxopt=/std=c++17"
537561
538562 integration_test_pip_repository_annotations_ubuntu_workspace :
539563 << : *reusable_build_test_all
0 commit comments