Skip to content

chore: Bump Bazel protobuf to match Make, bump Bazel version #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 26, 2024
Merged

chore: Bump Bazel protobuf to match Make, bump Bazel version #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f697f58
chore: Bump Bazel protobuf to match Make, bump Bazel version
martijneken Oct 25, 2024
7b7a9dc
Tiny tweak to sample Makefile
martijneken Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelversion
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.1.0
6.5.0
2 changes: 2 additions & 0 deletions bazel/dependencies.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@

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

# Requires proxy_wasm_cpp_sdk_repositories() to be loaded first.
def proxy_wasm_cpp_sdk_dependencies():
py_repositories()
protobuf_deps()
emsdk_deps()
15 changes: 12 additions & 3 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,21 @@ def proxy_wasm_cpp_sdk_repositories():
url = "https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.67.tar.gz",
)

# protobuf depends on rules_python py_repositories
maybe(
http_archive,
name = "rules_python",
sha256 = "778aaeab3e6cfd56d681c89f5c10d7ad6bf8d2f1a72de9de55b23081b2d31618",
strip_prefix = "rules_python-0.34.0",
url = "https://github.com/bazelbuild/rules_python/releases/download/0.34.0/rules_python-0.34.0.tar.gz",
)

maybe(
http_archive,
name = "com_google_protobuf",
sha256 = "77ad26d3f65222fd96ccc18b055632b0bfedf295cb748b712a98ba1ac0b704b2",
strip_prefix = "protobuf-3.17.3",
url = "https://github.com/protocolbuffers/protobuf/releases/download/v3.17.3/protobuf-all-3.17.3.tar.gz",
sha256 = "4fc5ff1b2c339fb86cd3a25f0b5311478ab081e65ad258c6789359cd84d421f8",
strip_prefix = "protobuf-26.1",
url = "https://github.com/protocolbuffers/protobuf/releases/download/v26.1/protobuf-26.1.tar.gz",
)

maybe(
Expand Down
6 changes: 6 additions & 0 deletions example/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
PROXY_WASM_CPP_SDK=/sdk

PROTOBUF= # full / lite / none
WASM_DEPS= # absl_base re2 ...

include ${PROXY_WASM_CPP_SDK}/Makefile
Loading