Fixes to make upb's tests compatible with a minimal Docker container.

pull/13171/head
Joshua Haberman 4 years ago
parent 7b960dddfc
commit eabb77458a
  1. 7
      WORKSPACE
  2. 8
      bazel/workspace_deps.bzl
  3. 2
      benchmarks/gen_protobuf_binary_cc.py
  4. 2
      benchmarks/gen_synthetic_protos.py
  5. 2
      benchmarks/gen_upb_binary_c.py

@ -1,7 +1,6 @@
workspace(name = "upb") workspace(name = "upb")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "new_git_repository")
load("//bazel:workspace_deps.bzl", "upb_deps") load("//bazel:workspace_deps.bzl", "upb_deps")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@ -32,11 +31,11 @@ http_archive(
sha256 = "59f918c8ccd4d74b6ac43484467b500f1d64b40cc1010daa055375b322a43ba3", sha256 = "59f918c8ccd4d74b6ac43484467b500f1d64b40cc1010daa055375b322a43ba3",
) )
new_git_repository( http_archive(
name = "com_google_googleapis", name = "com_google_googleapis",
remote = "https://github.com/googleapis/googleapis.git", urls = ["https://github.com/googleapis/googleapis/archive/refs/heads/master.zip"],
branch = "master",
build_file = "//benchmarks:BUILD.googleapis", build_file = "//benchmarks:BUILD.googleapis",
strip_prefix = "googleapis-master",
patch_cmds = ["find google -type f -name BUILD.bazel -delete"], patch_cmds = ["find google -type f -name BUILD.bazel -delete"],
) )

@ -1,14 +1,12 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
def upb_deps(): def upb_deps():
maybe( maybe(
git_repository, http_archive,
name = "com_google_absl", name = "com_google_absl",
commit = "998805a4c79d5d7a771f7e5a8ee3cbbbcba04f94", url = "https://github.com/abseil/abseil-cpp/archive/refs/heads/master.zip",
remote = "https://github.com/abseil/abseil-cpp.git", strip_prefix = "abseil-cpp-master",
shallow_since = "1583355457 -0500",
) )
maybe( maybe(

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python3
# #
# Copyright (c) 2009-2021, Google LLC # Copyright (c) 2009-2021, Google LLC
# All rights reserved. # All rights reserved.

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python3
# #
# Copyright (c) 2009-2021, Google LLC # Copyright (c) 2009-2021, Google LLC
# All rights reserved. # All rights reserved.

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/python3
# #
# Copyright (c) 2009-2021, Google LLC # Copyright (c) 2009-2021, Google LLC
# All rights reserved. # All rights reserved.

Loading…
Cancel
Save