diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-07-11 17:39:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-11 17:39:34 -0700 |
| commit | 82019f90fff5c44477f91084c84b24989a93df7a (patch) | |
| tree | f99ceb8c62b1229136e82cb34544491475baf0e5 | |
| parent | 4a4a60bf934b6c60862640afceb7f2d99890f7e3 (diff) | |
| parent | 0e38f9ee1bb98ef3d5b6bff678f265324fc25615 (diff) | |
| download | protobuf-82019f90fff5c44477f91084c84b24989a93df7a.tar.gz protobuf-82019f90fff5c44477f91084c84b24989a93df7a.tar.bz2 protobuf-82019f90fff5c44477f91084c84b24989a93df7a.zip | |
Merge pull request #4900 from xfxyjwf/3.6.x
Add kokoro bazel configs to 3.6.x branch.
| -rw-r--r-- | examples/WORKSPACE | 12 | ||||
| -rwxr-xr-x | kokoro/linux/bazel/build.sh | 12 | ||||
| -rw-r--r-- | kokoro/linux/bazel/continuous.cfg | 5 | ||||
| -rw-r--r-- | kokoro/linux/bazel/presubmit.cfg | 5 |
4 files changed, 32 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 new file mode 100755 index 00000000..e0c1ee42 --- /dev/null +++ b/kokoro/linux/bazel/build.sh @@ -0,0 +1,12 @@ +#!/bin/bash +# +# Build file to set up and run tests + +# Change to repo root +cd $(dirname $0)/../../.. + +git submodule update --init --recursive +bazel test :protobuf_test + +cd examples +bazel build :all diff --git a/kokoro/linux/bazel/continuous.cfg b/kokoro/linux/bazel/continuous.cfg new file mode 100644 index 00000000..13cfef15 --- /dev/null +++ b/kokoro/linux/bazel/continuous.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel/build.sh" +timeout_mins: 15 diff --git a/kokoro/linux/bazel/presubmit.cfg b/kokoro/linux/bazel/presubmit.cfg new file mode 100644 index 00000000..13cfef15 --- /dev/null +++ b/kokoro/linux/bazel/presubmit.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel/build.sh" +timeout_mins: 15 |