Skip to content

Commit 0785dc4

Browse files
committed
current progress
1 parent 45ee90d commit 0785dc4

File tree

3 files changed

+20
-9
lines changed

3 files changed

+20
-9
lines changed

MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ module(
2222

2323
bazel_dep(name = "platforms", version = "0.0.11")
2424
bazel_dep(name = "bazel_skylib", version = "1.7.1")
25-
bazel_dep(name = "rules_cc", version = "0.0.17")
25+
bazel_dep(name = "rules_cc", version = "0.1.1")
2626
bazel_dep(name = "abseil-cpp", version = "20250127.1", repo_name = "abseil-cpp")
27-
bazel_dep(name = "protobuf", version = "30.0", repo_name = "com_google_protobuf")
27+
bazel_dep(name = "protobuf", version = "30.2", repo_name = "com_google_protobuf")
2828
bazel_dep(name = "boringssl", version = "0.0.0-20230215-5c22014")
2929
bazel_dep(name = "nlohmann_json", version = "3.11.3", repo_name = "com_github_nlohmann_json")
3030
bazel_dep(name = "curl", version = "8.8.0.bcr.2", repo_name = "com_github_curl_curl")

bazel/workspace0.bzl

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,21 @@ def gl_cpp_workspace0(name = None):
7171
http_archive,
7272
name = "rules_cc",
7373
urls = [
74-
"https://github.com/bazelbuild/rules_cc/releases/download/0.0.17/rules_cc-0.0.17.tar.gz",
74+
"https://github.com/bazelbuild/rules_cc/releases/download/0.1.1/rules_cc-0.1.1.tar.gz",
7575
],
76-
sha256 = "abc605dd850f813bb37004b77db20106a19311a96b2da1c92b789da529d28fe1",
77-
strip_prefix = "rules_cc-0.0.17",
76+
# sha256 = "abc605dd850f813bb37004b77db20106a19311a96b2da1c92b789da529d28fe1",
77+
strip_prefix = "rules_cc-0.1.1",
78+
)
79+
80+
# Load rules_java, for some reason only bazel knows
81+
maybe(
82+
http_archive,
83+
name = "rules_java",
84+
urls = [
85+
"https://github.com/bazelbuild/rules_java/releases/download/8.11.0/rules_java-8.11.0.tar.gz",
86+
],
87+
# sha256 = "abc605dd850f813bb37004b77db20106a19311a96b2da1c92b789da529d28fe1",
88+
strip_prefix = "rules_java-8.11.0",
7889
)
7990

8091
maybe(
@@ -156,10 +167,10 @@ def gl_cpp_workspace0(name = None):
156167
http_archive,
157168
name = "com_google_protobuf",
158169
urls = [
159-
"https://github.com/protocolbuffers/protobuf/archive/v30.0.tar.gz",
170+
"https://github.com/protocolbuffers/protobuf/archive/v30.2.tar.gz",
160171
],
161172
sha256 = "9df0e9e8ebe39f4fbbb9cf7db3d811287fe3616b2f191eb2bf5eaa12539c881f",
162-
strip_prefix = "protobuf-30.0",
173+
strip_prefix = "protobuf-30.2",
163174
)
164175

165176
# Load BoringSSL. This could be automatically loaded by gRPC. But as of

ci/cloudbuild/builds/quickstart-bazel.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ export CXX=g++
2727
mapfile -t args < <(bazel::common_args)
2828
for lib in $(quickstart::libraries); do
2929
io::log_h2 "Running Bazel quickstart for ${lib}"
30-
env -C "${PROJECT_ROOT}/google/cloud/${lib}/quickstart" \
31-
bazel build "${args[@]}" :quickstart
30+
io::run env -C "${PROJECT_ROOT}/google/cloud/${lib}/quickstart" \
31+
bazel build --explain=/tmp/explain.txt --sandbox_debug "${args[@]}" :quickstart
3232
done

0 commit comments

Comments
 (0)