From b5975c109aeb3d4f77d662e7b7222b87c653c69d Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Wed, 11 Jul 2018 16:34:58 -0700
Subject: Add kokoro bazel configs for 3.6.x branch.

---
 kokoro/linux/bazel/build.sh       | 12 ++++++++++++
 kokoro/linux/bazel/continuous.cfg |  5 +++++
 kokoro/linux/bazel/presubmit.cfg  |  5 +++++
 3 files changed, 22 insertions(+)
 create mode 100755 kokoro/linux/bazel/build.sh
 create mode 100644 kokoro/linux/bazel/continuous.cfg
 create mode 100644 kokoro/linux/bazel/presubmit.cfg

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
-- 
cgit v1.2.3


From 0e38f9ee1bb98ef3d5b6bff678f265324fc25615 Mon Sep 17 00:00:00 2001
From: Feng Xiao <xfxyjwf@gmail.com>
Date: Wed, 11 Jul 2018 16:55:03 -0700
Subject: Fix bazel build of examples.

---
 examples/WORKSPACE | 12 ++++++++++--
 1 file changed, 10 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")
-- 
cgit v1.2.3