Skip to content

Commit 28e227c

Browse files
authored
chore: Bump Bazel protobuf to match Make, bump Bazel version (#176)
Bump Bazel protobuf to match Make, bump Bazel version Signed-off-by: Martijn Stevenson <mstevenson@google.com>
1 parent 9dc95ae commit 28e227c

File tree

4 files changed

+21
-4
lines changed

4 files changed

+21
-4
lines changed

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.1.0
1+
6.5.0

bazel/dependencies.bzl

+2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@
1414

1515
load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
1616
load("@emsdk//:deps.bzl", emsdk_deps = "deps")
17+
load("@rules_python//python:repositories.bzl", "py_repositories")
1718

1819
# Requires proxy_wasm_cpp_sdk_repositories() to be loaded first.
1920
def proxy_wasm_cpp_sdk_dependencies():
21+
py_repositories()
2022
protobuf_deps()
2123
emsdk_deps()

bazel/repositories.bzl

+12-3
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,21 @@ def proxy_wasm_cpp_sdk_repositories():
2424
url = "https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.67.tar.gz",
2525
)
2626

27+
# protobuf depends on rules_python py_repositories
28+
maybe(
29+
http_archive,
30+
name = "rules_python",
31+
sha256 = "778aaeab3e6cfd56d681c89f5c10d7ad6bf8d2f1a72de9de55b23081b2d31618",
32+
strip_prefix = "rules_python-0.34.0",
33+
url = "https://github.com/bazelbuild/rules_python/releases/download/0.34.0/rules_python-0.34.0.tar.gz",
34+
)
35+
2736
maybe(
2837
http_archive,
2938
name = "com_google_protobuf",
30-
sha256 = "77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2",
31-
strip_prefix = "protobuf-3.17.3",
32-
url = "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-all-3.17.3.tar.gz",
39+
sha256 = "4fc5ff1b2c339fb86cd3a25f0b5311478ab081e65ad258c6789359cd84d421f8",
40+
strip_prefix = "protobuf-26.1",
41+
url = "https://github.com/protocolbuffers/protobuf/releases/download/v26.1/protobuf-26.1.tar.gz",
3342
)
3443

3544
maybe(

example/Makefile

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
PROXY_WASM_CPP_SDK=/sdk
2+
3+
PROTOBUF= # full / lite / none
4+
WASM_DEPS= # absl_base re2 ...
5+
6+
include ${PROXY_WASM_CPP_SDK}/Makefile

0 commit comments

Comments
 (0)