diff options
| author |  Feng Xiao <xfxyjwf@gmail.com> | 2018-07-03 11:26:13 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-07-03 11:26:13 -0700 |
| commit | c5228890381e39ffb98c8ba54a736bed382ac51d (patch) | |
| tree | dd753b899f58032ed838b6dcdac5514c8b62eec8 | |
| parent | 0c686d15765999aaaa8bc2f853cc96df9161ba20 (diff) | |
| parent | 1a7ce04be7b455806fb201fc8674f684058d8af5 (diff) | |
Merge pull request #4863 from xfxyjwf/examples
Fix bazel build of examples.
| -rw-r--r-- | examples/WORKSPACE | 12 | ||||
| -rwxr-xr-x | kokoro/linux/bazel/build.sh | 3 |
2 files changed, 13 insertions, 2 deletions
diff --git a/examples/WORKSPACE b/examples/WORKSPACE index 936f2441..153a5932 100644 --- a/examples/WORKSPACE +++ b/examples/WORKSPACE @@ -5,8 +5,6 @@ http_archive( strip_prefix = "protobuf-master", urls = ["https://github.com/google/protobuf/archive/master.zip"], ) -load("@com_google_protobuf//:protobuf.bzl", "check_protobuf_required_bazel_version") -check_protobuf_required_bazel_version() # This com_google_protobuf_cc repository is required for cc_proto_library # rule. It provides protobuf C++ runtime. Note that it actually is the same @@ -33,3 +31,13 @@ http_archive( strip_prefix = "protobuf-javalite", urls = ["https://github.com/google/protobuf/archive/javalite.zip"], ) + +http_archive( + name = "bazel_skylib", + sha256 = "bbccf674aa441c266df9894182d80de104cabd19be98be002f6d478aaa31574d", + strip_prefix = "bazel-skylib-2169ae1c374aab4a09aa90e65efe1a3aad4e279b", + urls = ["https://github.com/bazelbuild/bazel-skylib/archive/2169ae1c374aab4a09aa90e65efe1a3aad4e279b.tar.gz"], +) + +load("@bazel_skylib//:lib.bzl", "versions") +versions.check(minimum_bazel_version = "0.5.4") diff --git a/kokoro/linux/bazel/build.sh b/kokoro/linux/bazel/build.sh index d8aea724..e0c1ee42 100755 --- a/kokoro/linux/bazel/build.sh +++ b/kokoro/linux/bazel/build.sh @@ -7,3 +7,6 @@ cd $(dirname $0)/../../.. git submodule update --init --recursive bazel test :protobuf_test + +cd examples +bazel build :all |