From 92b874aa61c375fbb68d469c9dc85ec7e92e33ba Mon Sep 17 00:00:00 2001 From: Mike Kruskal Date: Tue, 1 Oct 2024 10:45:01 -0700 Subject: [PATCH 1/2] Drop bazel 6 in BCR and add --experimental_google_legacy_api for testing PiperOrigin-RevId: 681081216 --- .bcr/presubmit.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml index 928750c6e402..e26eefaadcc6 100644 --- a/.bcr/presubmit.yml +++ b/.bcr/presubmit.yml @@ -1,6 +1,6 @@ matrix: platform: ["debian10", "macos", "ubuntu2004", "windows"] - bazel: [6.x, 7.x] + bazel: [7.x] tasks: verify_targets: @@ -10,6 +10,7 @@ tasks: build_flags: - '--host_cxxopt=-std=c++14' - '--cxxopt=-std=c++14' + - '--experimental_google_legacy_api' build_targets: - '@protobuf//:protobuf' - '@protobuf//:protobuf_lite' @@ -23,7 +24,7 @@ bcr_test_module: module_path: "examples" matrix: platform: ["debian10", "macos", "ubuntu2004", "windows"] - bazel: [6.x, 7.x] + bazel: [7.x] tasks: run_test_module: name: "Run test module" @@ -32,5 +33,6 @@ bcr_test_module: build_flags: - '--host_cxxopt=-std=c++14' - '--cxxopt=-std=c++14' + - '--experimental_google_legacy_api' build_targets: - "//..." From 9724288d8f7c50103cb7562915ca5c5984de85be Mon Sep 17 00:00:00 2001 From: Sandy Zhang Date: Mon, 18 Nov 2024 18:36:59 -0500 Subject: [PATCH 2/2] Remove --experimental_google_legacy_api --- .bcr/presubmit.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.bcr/presubmit.yml b/.bcr/presubmit.yml index e26eefaadcc6..bdb24a1781d3 100644 --- a/.bcr/presubmit.yml +++ b/.bcr/presubmit.yml @@ -10,7 +10,6 @@ tasks: build_flags: - '--host_cxxopt=-std=c++14' - '--cxxopt=-std=c++14' - - '--experimental_google_legacy_api' build_targets: - '@protobuf//:protobuf' - '@protobuf//:protobuf_lite' @@ -33,6 +32,5 @@ bcr_test_module: build_flags: - '--host_cxxopt=-std=c++14' - '--cxxopt=-std=c++14' - - '--experimental_google_legacy_api' build_targets: - "//..."