Skip to content

Commit fa196a5

Browse files
committed
use C++17 for bazel7
1 parent 427f941 commit fa196a5

File tree

1 file changed

+49
-10
lines changed

1 file changed

+49
-10
lines changed

.bazelci/presubmit.yml

Lines changed: 49 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,18 @@ buildifier:
1818
# Use a specific version to avoid skew issues when new versions are released.
1919
version: 6.1.0
2020
warnings: "all"
21+
.bazel_7_cxx_17_config: &bazel_7_cxx_17_config
22+
# recent protobuf and abseil-cpp requires C++17 which is not used by default in Bazel 7
23+
- "--cxxopt=-std=c++17"
24+
- "--host_cxxopt=-std=c++17"
2125
# NOTE: Minimum supported version is 7.x
2226
.minimum_supported_version: &minimum_supported_version
2327
# For testing minimum supported version.
2428
# NOTE: Keep in sync with //:version.bzl
29+
build_flags:
30+
<<: *bazel_7_cxx_17_config
31+
test_flags:
32+
<<: *bazel_7_cxx_17_config
2533
bazel: 7.x
2634
skip_in_bazel_downstream_pipeline: "Bazel 7 required"
2735
.reusable_config: &reusable_config
@@ -39,29 +47,44 @@ buildifier:
3947
- "..."
4048
test_flags:
4149
- "--test_tag_filters=-integration-test"
50+
.reusable_config_bazel_7: &reusable_config_bazel_7
51+
build_targets:
52+
- "--"
53+
- "..."
54+
# As a regression test for #225, check that wheel targets still build when
55+
# their package path is qualified with the repo name.
56+
- "@rules_python//examples/wheel/..."
57+
build_flags:
58+
- "--keep_going"
59+
- "--build_tag_filters=-integration-test"
60+
<<: *bazel_7_cxx_17_config
61+
test_targets:
62+
- "--"
63+
- "..."
64+
test_flags:
65+
- "--test_tag_filters=-integration-test"
66+
<<: *bazel_7_cxx_17_config
4267
.common_workspace_flags_min_bazel: &common_workspace_flags_min_bazel
4368
build_flags:
4469
- "--noenable_bzlmod"
4570
- "--build_tag_filters=-integration-test"
46-
# recent abseil-cpp requires C++17 which is not used by default in Bazel 7
47-
- "--cxxopt=-std=c++17"
48-
- "--host_cxxopt=-std=c++17"
71+
<<: *bazel_7_cxx_17_config
4972
test_flags:
5073
- "--noenable_bzlmod"
5174
- "--test_tag_filters=-integration-test"
52-
# recent abseil-cpp requires C++17 which is not used by default in Bazel 7
53-
- "--cxxopt=-std=c++17"
54-
- "--host_cxxopt=-std=c++17"
75+
<<: *bazel_7_cxx_17_config
5576
.common_workspace_flags: &common_workspace_flags
5677
skip_in_bazel_downstream_pipeline: "Bazel 9 doesn't support workspace"
5778
test_flags:
5879
- "--noenable_bzlmod"
5980
- "--enable_workspace"
6081
- "--test_tag_filters=-integration-test"
82+
<<: *bazel_7_cxx_17_config
6183
build_flags:
6284
- "--noenable_bzlmod"
6385
- "--enable_workspace"
6486
- "--build_tag_filters=-integration-test"
87+
<<: *bazel_7_cxx_17_config
6588
bazel: 7.x
6689
# NOTE: The Mac and Windows bazelinbazel jobs override parts of this config.
6790
.common_bazelinbazel_config: &common_bazelinbazel_config
@@ -125,7 +148,7 @@ tasks:
125148

126149
ubuntu_min_bzlmod:
127150
<<: *minimum_supported_version
128-
<<: *reusable_config
151+
<<: *reusable_config_bazel_7
129152
name: "Default: Ubuntu, bzlmod, minimum Bazel"
130153
platform: ubuntu2204
131154
bazel: 7.x
@@ -204,7 +227,7 @@ tasks:
204227
- "--test_tag_filters=-integration-test,-fix-windows"
205228
rbe_min:
206229
<<: *minimum_supported_version
207-
<<: *reusable_config
230+
<<: *reusable_config_bazel_7
208231
name: "RBE: Ubuntu, minimum Bazel"
209232
platform: rbe_ubuntu2204
210233
build_flags:
@@ -222,7 +245,7 @@ tasks:
222245
# build kite cc toolchain.
223246
- "--extra_toolchains=@buildkite_config//config:cc-toolchain"
224247
rbe:
225-
<<: *reusable_config
248+
<<: *reusable_config_bazel_7
226249
name: "RBE: Ubuntu"
227250
platform: rbe_ubuntu2204
228251
# TODO @aignas 2024-12-11: get the RBE working in CI for bazel 8.0
@@ -231,7 +254,7 @@ tasks:
231254
test_flags:
232255
- "--test_tag_filters=-integration-test,-acceptance-test"
233256
- "--extra_toolchains=@buildkite_config//config:cc-toolchain"
234-
257+
<<: *bazel_7_cxx_17_config
235258
integration_test_build_file_generation_ubuntu_minimum_supported_workspace:
236259
<<: *minimum_supported_version
237260
<<: *reusable_build_test_all
@@ -279,6 +302,10 @@ tasks:
279302
working_directory: examples/bzlmod
280303
platform: ubuntu2204
281304
bazel: 7.x
305+
build_flags:
306+
<<: *bazel_7_cxx_17_config
307+
test_flags:
308+
<<: *bazel_7_cxx_17_config
282309
integration_test_bzlmod_ubuntu_upcoming:
283310
<<: *reusable_build_test_all
284311
<<: *coverage_targets_example_bzlmod
@@ -293,6 +320,10 @@ tasks:
293320
working_directory: examples/bzlmod
294321
platform: debian11
295322
bazel: 7.x
323+
build_flags:
324+
<<: *bazel_7_cxx_17_config
325+
test_flags:
326+
<<: *bazel_7_cxx_17_config
296327
integration_test_bzlmod_ubuntu_vendor:
297328
<<: *reusable_build_test_all
298329
name: "examples/bzlmod: bazel vendor"
@@ -309,6 +340,10 @@ tasks:
309340
working_directory: examples/bzlmod
310341
platform: macos
311342
bazel: 7.x
343+
build_flags:
344+
<<: *bazel_7_cxx_17_config
345+
test_flags:
346+
<<: *bazel_7_cxx_17_config
312347
integration_test_bzlmod_macos_upcoming:
313348
<<: *reusable_build_test_all
314349
<<: *coverage_targets_example_bzlmod
@@ -323,6 +358,10 @@ tasks:
323358
working_directory: examples/bzlmod
324359
platform: windows
325360
bazel: 7.x
361+
build_flags:
362+
<<: *bazel_7_cxx_17_config
363+
test_flags:
364+
<<: *bazel_7_cxx_17_config
326365
integration_test_bzlmod_windows_upcoming:
327366
<<: *reusable_build_test_all
328367
# coverage is not supported on Windows

0 commit comments

Comments
 (0)