bazel: Upgrade to bazel 6.0.0
BUG=259298367
Change-Id: I58d358fd4ab9f4eb4a2e65db27223c0fb7b28e3d
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/126680
Commit-Queue: Ted Pudlik <tpudlik@google.com>
Reviewed-by: Anthony DiGirolamo <tonymd@google.com>
diff --git a/WORKSPACE b/WORKSPACE
index a229724..d78c382 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -14,7 +14,6 @@
workspace(
name = "pigweed",
- managed_directories = {"@npm": ["node_modules"]},
)
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -29,10 +28,13 @@
# Set up Bazel platforms.
# Required by: pigweed.
# Used in modules: //pw_build, (Assorted modules via select statements).
-git_repository(
+http_archive(
name = "platforms",
- commit = "380c85cc2c7b126c6e354f517dc16d89fe760c9f",
- remote = "https://github.com/bazelbuild/platforms.git",
+ sha256 = "5308fc1d8865406a49427ba24a9ab53087f17f5266a7aabbfc28823f3916e1ca",
+ urls = [
+ "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.6/platforms-0.0.6.tar.gz",
+ "https://github.com/bazelbuild/platforms/releases/download/0.0.6/platforms-0.0.6.tar.gz",
+ ],
)
# Setup CIPD client and packages.
@@ -69,12 +71,10 @@
# in an older version of bazel_skylib. However io_bazel_rules_go requires a
# newer version.
http_archive(
- name = "bazel_skylib",
- sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
- urls = [
- "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
- "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
- ],
+ name = "bazel_skylib", # 2022-09-01
+ sha256 = "4756ab3ec46d94d99e5ed685d2d24aece484015e45af303eb3a11cab3cdc2e71",
+ strip_prefix = "bazel-skylib-1.3.0",
+ urls = ["https://github.com/bazelbuild/bazel-skylib/archive/refs/tags/1.3.0.zip"],
)
load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
@@ -86,11 +86,10 @@
# Used in modules: //pw_analog, //pw_i2c.
http_archive(
name = "com_google_googletest",
- sha256 = "9dc9157a9a1551ec7a7e43daea9a694a0bb5fb8bec81235d8a1e6ef64c716dcb",
- strip_prefix = "googletest-release-1.10.0",
+ sha256 = "ad7fdba11ea011c1d925b3289cf4af2c66a352e18d4c7264392fead75e919363",
+ strip_prefix = "googletest-1.13.0",
urls = [
- "https://mirror.bazel.build/github.com/google/googletest/archive/release-1.10.0.tar.gz",
- "https://github.com/google/googletest/archive/release-1.10.0.tar.gz",
+ "https://github.com/google/googletest/archive/refs/tags/v1.13.0.tar.gz",
],
)
@@ -278,9 +277,9 @@
# Used in modules: //pw_protobuf, //pw_tokenizer, //pw_fuzzer.
http_archive(
name = "rules_fuzzing",
- sha256 = "94f25c7a18db0502ace26a3ef7d0a25fd7c195c4e9770ddd1b1ec718e8936091",
- strip_prefix = "rules_fuzzing-0.1.3",
- urls = ["https://github.com/bazelbuild/rules_fuzzing/archive/v0.1.3.zip"],
+ sha256 = "d9002dd3cd6437017f08593124fdd1b13b3473c7b929ceb0e60d317cb9346118",
+ strip_prefix = "rules_fuzzing-0.3.2",
+ urls = ["https://github.com/bazelbuild/rules_fuzzing/archive/v0.3.2.zip"],
)
load("@rules_fuzzing//fuzzing:repositories.bzl", "rules_fuzzing_dependencies")
diff --git a/pw_chrono/BUILD.bazel b/pw_chrono/BUILD.bazel
index 1952c57..172abf8 100644
--- a/pw_chrono/BUILD.bazel
+++ b/pw_chrono/BUILD.bazel
@@ -104,7 +104,7 @@
"chrono.proto",
],
import_prefix = "pw_chrono_protos",
- strip_import_prefix = "//pw_chrono",
+ strip_import_prefix = "/pw_chrono",
)
py_proto_library(
diff --git a/pw_cpu_exception_cortex_m/BUILD.bazel b/pw_cpu_exception_cortex_m/BUILD.bazel
index a37b3f1c..102d5eb 100644
--- a/pw_cpu_exception_cortex_m/BUILD.bazel
+++ b/pw_cpu_exception_cortex_m/BUILD.bazel
@@ -95,7 +95,7 @@
name = "cpu_state_protos",
srcs = ["pw_cpu_exception_cortex_m_protos/cpu_state.proto"],
import_prefix = "pw_cpu_exception_cortex_m_protos",
- strip_import_prefix = "//pw_cpu_exception_cortex_m/pw_cpu_exception_cortex_m_protos",
+ strip_import_prefix = "/pw_cpu_exception_cortex_m/pw_cpu_exception_cortex_m_protos",
)
py_proto_library(
diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json b/pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json
index 09bbf73..f555cca 100644
--- a/pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json
@@ -7,22 +7,12 @@
"path": "fuchsia/third_party/bazel/${platform}",
"platforms": [
"linux-amd64",
- "mac-amd64"
- ],
- "tags": [
- "version:2@5.3.2.2"
- ],
- "version_file": ".versions/bazel.cipd_version"
- },
- {
- "path": "fuchsia/third_party/bazel/${platform}",
- "platforms": [
+ "mac-amd64",
"windows-amd64"
],
"tags": [
- "version:2@5.3.2"
+ "version:2@6.0.0.5"
],
- "_comment": "The Fuchsia 3pp package adds a patch_version to Linux and Mac, but not Windows",
"version_file": ".versions/bazel.cipd_version"
}
]
diff --git a/pw_log/BUILD.bazel b/pw_log/BUILD.bazel
index 4666368..b1bf3ac 100644
--- a/pw_log/BUILD.bazel
+++ b/pw_log/BUILD.bazel
@@ -89,7 +89,7 @@
"log.proto",
],
import_prefix = "pw_log/proto",
- strip_import_prefix = "//pw_log",
+ strip_import_prefix = "/pw_log",
deps = [
"//pw_protobuf:common_proto",
"//pw_tokenizer:tokenizer_proto",
diff --git a/pw_protobuf/BUILD.bazel b/pw_protobuf/BUILD.bazel
index da1b4b8..630c528 100644
--- a/pw_protobuf/BUILD.bazel
+++ b/pw_protobuf/BUILD.bazel
@@ -191,7 +191,7 @@
srcs = [
"pw_protobuf_codegen_protos/codegen_options.proto",
],
- strip_import_prefix = "//pw_protobuf",
+ strip_import_prefix = "/pw_protobuf",
)
py_proto_library(
@@ -206,7 +206,7 @@
srcs = [
"pw_protobuf_protos/common.proto",
],
- strip_import_prefix = "//pw_protobuf",
+ strip_import_prefix = "/pw_protobuf",
)
proto_library(
@@ -214,7 +214,7 @@
srcs = [
"pw_protobuf_protos/field_options.proto",
],
- strip_import_prefix = "//pw_protobuf",
+ strip_import_prefix = "/pw_protobuf",
deps = [
"@com_google_protobuf//:descriptor_proto",
],
@@ -235,7 +235,7 @@
srcs = [
"pw_protobuf_protos/status.proto",
],
- strip_import_prefix = "//pw_protobuf",
+ strip_import_prefix = "/pw_protobuf",
)
py_proto_library(
@@ -250,7 +250,7 @@
srcs = [
"pw_protobuf_test_deps_protos/imported.proto",
],
- strip_import_prefix = "//pw_protobuf",
+ strip_import_prefix = "/pw_protobuf",
)
proto_library(
@@ -265,7 +265,7 @@
"pw_protobuf_test_protos/repeated.proto",
"pw_protobuf_test_protos/size_report.proto",
],
- strip_import_prefix = "//pw_protobuf",
+ strip_import_prefix = "/pw_protobuf",
deps = [
":codegen_test_deps_protos",
":common_proto",
diff --git a/pw_protobuf_compiler/pw_nested_packages/BUILD.bazel b/pw_protobuf_compiler/pw_nested_packages/BUILD.bazel
index 036de7a..92a3073 100644
--- a/pw_protobuf_compiler/pw_nested_packages/BUILD.bazel
+++ b/pw_protobuf_compiler/pw_nested_packages/BUILD.bazel
@@ -21,7 +21,7 @@
name = "aggregate",
srcs = ["aggregate.proto"],
import_prefix = "proto_root",
- strip_import_prefix = "//pw_protobuf_compiler/pw_nested_packages",
+ strip_import_prefix = "/pw_protobuf_compiler/pw_nested_packages",
deps = [
"//pw_protobuf_compiler/pw_nested_packages/data_type/id",
"//pw_protobuf_compiler/pw_nested_packages/data_type/thing",
@@ -40,7 +40,7 @@
name = "aggregate_wrapper",
srcs = ["aggregate_wrapper.proto"],
import_prefix = "proto_root",
- strip_import_prefix = "//pw_protobuf_compiler/pw_nested_packages",
+ strip_import_prefix = "/pw_protobuf_compiler/pw_nested_packages",
deps = [
":aggregate",
"//pw_protobuf_compiler/pw_nested_packages/data_type/id",
diff --git a/pw_protobuf_compiler/pw_nested_packages/data_type/id/BUILD.bazel b/pw_protobuf_compiler/pw_nested_packages/data_type/id/BUILD.bazel
index de189c6..9d9fa41 100644
--- a/pw_protobuf_compiler/pw_nested_packages/data_type/id/BUILD.bazel
+++ b/pw_protobuf_compiler/pw_nested_packages/data_type/id/BUILD.bazel
@@ -24,7 +24,7 @@
"internal/id_internal.proto",
],
import_prefix = "proto_root",
- strip_import_prefix = "//pw_protobuf_compiler/pw_nested_packages",
+ strip_import_prefix = "/pw_protobuf_compiler/pw_nested_packages",
)
pw_proto_library(
diff --git a/pw_protobuf_compiler/pw_nested_packages/data_type/thing/BUILD.bazel b/pw_protobuf_compiler/pw_nested_packages/data_type/thing/BUILD.bazel
index 2547bb0..12c7aad 100644
--- a/pw_protobuf_compiler/pw_nested_packages/data_type/thing/BUILD.bazel
+++ b/pw_protobuf_compiler/pw_nested_packages/data_type/thing/BUILD.bazel
@@ -21,7 +21,7 @@
name = "type_of_thing",
srcs = ["type_of_thing.proto"],
import_prefix = "proto_root",
- strip_import_prefix = "//pw_protobuf_compiler/pw_nested_packages",
+ strip_import_prefix = "/pw_protobuf_compiler/pw_nested_packages",
)
pw_proto_library(
@@ -35,7 +35,7 @@
name = "thing",
srcs = ["thing.proto"],
import_prefix = "proto_root",
- strip_import_prefix = "//pw_protobuf_compiler/pw_nested_packages",
+ strip_import_prefix = "/pw_protobuf_compiler/pw_nested_packages",
deps = [
":type_of_thing",
"//pw_protobuf_compiler/pw_nested_packages/data_type/id",
diff --git a/pw_rpc/BUILD.bazel b/pw_rpc/BUILD.bazel
index 6af2db8..12a4998 100644
--- a/pw_rpc/BUILD.bazel
+++ b/pw_rpc/BUILD.bazel
@@ -386,7 +386,7 @@
"pw_rpc_test_protos/no_package.proto",
"pw_rpc_test_protos/test.proto",
],
- strip_import_prefix = "//pw_rpc",
+ strip_import_prefix = "/pw_rpc",
)
pw_proto_library(
diff --git a/pw_snapshot/BUILD.bazel b/pw_snapshot/BUILD.bazel
index c1e3e62..ae98aec 100644
--- a/pw_snapshot/BUILD.bazel
+++ b/pw_snapshot/BUILD.bazel
@@ -47,7 +47,7 @@
"pw_snapshot_protos/snapshot_metadata.proto",
],
import_prefix = "pw_snapshot_metadata_proto",
- strip_import_prefix = "//pw_snapshot/pw_snapshot_protos",
+ strip_import_prefix = "/pw_snapshot/pw_snapshot_protos",
deps = [
"//pw_tokenizer:tokenizer_proto",
],
@@ -66,7 +66,7 @@
"pw_snapshot_protos/snapshot.proto",
],
import_prefix = "pw_snapshot_protos",
- strip_import_prefix = "//pw_snapshot/pw_snapshot_protos",
+ strip_import_prefix = "/pw_snapshot/pw_snapshot_protos",
deps = [
":metadata_proto",
"//pw_chrono:chrono_proto",
diff --git a/pw_thread/BUILD.bazel b/pw_thread/BUILD.bazel
index 2e20f1d..c61f095 100644
--- a/pw_thread/BUILD.bazel
+++ b/pw_thread/BUILD.bazel
@@ -357,7 +357,7 @@
proto_library(
name = "thread_proto",
srcs = ["pw_thread_protos/thread.proto"],
- strip_import_prefix = "//pw_thread",
+ strip_import_prefix = "/pw_thread",
deps = [
"//pw_tokenizer:tokenizer_proto",
],
@@ -373,7 +373,7 @@
proto_library(
name = "thread_snapshot_service_proto",
srcs = ["pw_thread_protos/thread_snapshot_service.proto"],
- strip_import_prefix = "//pw_thread",
+ strip_import_prefix = "/pw_thread",
deps = [
":thread_proto",
],
diff --git a/pw_tokenizer/BUILD.bazel b/pw_tokenizer/BUILD.bazel
index fdcba9a..32d90e8 100644
--- a/pw_tokenizer/BUILD.bazel
+++ b/pw_tokenizer/BUILD.bazel
@@ -126,7 +126,7 @@
"options.proto",
],
import_prefix = "pw_tokenizer/proto",
- strip_import_prefix = "//pw_tokenizer",
+ strip_import_prefix = "/pw_tokenizer",
deps = [
"@com_google_protobuf//:descriptor_proto",
],
diff --git a/pw_transfer/BUILD.bazel b/pw_transfer/BUILD.bazel
index 84b9254..577d658 100644
--- a/pw_transfer/BUILD.bazel
+++ b/pw_transfer/BUILD.bazel
@@ -266,7 +266,7 @@
"test_server.proto",
],
import_prefix = "pw_transfer_test",
- strip_import_prefix = "//pw_transfer",
+ strip_import_prefix = "/pw_transfer",
deps = [
"//pw_protobuf:common_proto",
],
diff --git a/pw_unit_test/BUILD.bazel b/pw_unit_test/BUILD.bazel
index 9f46df8..cddf641 100644
--- a/pw_unit_test/BUILD.bazel
+++ b/pw_unit_test/BUILD.bazel
@@ -154,7 +154,7 @@
proto_library(
name = "unit_test_proto",
srcs = ["pw_unit_test_proto/unit_test.proto"],
- strip_import_prefix = "//pw_unit_test",
+ strip_import_prefix = "/pw_unit_test",
)
py_proto_library(
