diff --git a/.github/workflows/test_bazel.yml b/.github/workflows/test_bazel.yml index a58036328f..2ba549a1e6 100644 --- a/.github/workflows/test_bazel.yml +++ b/.github/workflows/test_bazel.yml @@ -20,7 +20,4 @@ jobs: test: uses: bazel-contrib/.github/.github/workflows/bazel.yaml@v6 with: - folders: | - [ - "examples" - ] + folders: '["examples"]' diff --git a/examples/MODULE.bazel b/examples/MODULE.bazel index 53ecf52bb9..41e8e8ece6 100644 --- a/examples/MODULE.bazel +++ b/examples/MODULE.bazel @@ -8,6 +8,6 @@ local_path_override( bazel_dep(name = "bazel_skylib", version = "1.5.0") bazel_dep(name = "rules_cc", version = "0.0.9") -bazel_dep(name = "rules_java", version = "7.5.0") +bazel_dep(name = "rules_java", version = "7.3.0") bazel_dep(name = "rules_pkg", version = "0.10.1") bazel_dep(name = "rules_proto", version = "6.0.0-rc2") diff --git a/examples/WORKSPACE b/examples/WORKSPACE index e9811efff2..901b344be6 100644 --- a/examples/WORKSPACE +++ b/examples/WORKSPACE @@ -28,6 +28,15 @@ local_repository( path = "..", ) +# Needed because protobuf_deps brings rules_python 0.26.0 which is broken: +# https://github.com/bazelbuild/rules_python/issues/1543 +http_archive( + name = "rules_python", + sha256 = "5868e73107a8e85d8f323806e60cad7283f34b32163ea6ff1020cf27abef6036", + strip_prefix = "rules_python-0.25.0", + url = "https://github.com/bazelbuild/rules_python/releases/download/0.25.0/rules_python-0.25.0.tar.gz", +) + load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps") protobuf_deps() diff --git a/src/google/protobuf/util/BUILD.bazel b/src/google/protobuf/util/BUILD.bazel index f84c22b074..3edbc4aeae 100644 --- a/src/google/protobuf/util/BUILD.bazel +++ b/src/google/protobuf/util/BUILD.bazel @@ -162,8 +162,6 @@ cc_library( hdrs = ["time_util.h"], strip_include_prefix = "/src", visibility = [ - #"//:__subpackages__", - #"@com_google_protobuf_examples//:__subpackages__", # Needed when building from within the /examples repository "//visibility:public", ],