Fix broken examples build (#10614)
* Add .bazelrc for examples repo
* Include examples in some of our basic tests
diff --git a/examples/.bazelrc b/examples/.bazelrc
new file mode 100644
index 0000000..554440c
--- /dev/null
+++ b/examples/.bazelrc
@@ -0,0 +1 @@
+build --cxxopt=-std=c++14 --host_cxxopt=-std=c++14
diff --git a/kokoro/linux/bazel/common.cfg b/kokoro/linux/bazel/common.cfg
index 6d35d8b..cd41cb2 100644
--- a/kokoro/linux/bazel/common.cfg
+++ b/kokoro/linux/bazel/common.cfg
@@ -6,7 +6,7 @@
env_vars {
key: "BAZEL_TARGETS"
- value: "//src/..."
+ value: "//src/... @com_google_protobuf_examples//..."
}
action {
diff --git a/kokoro/linux/cmake/build.sh b/kokoro/linux/cmake/build.sh
index 523253d..ee06d95 100755
--- a/kokoro/linux/cmake/build.sh
+++ b/kokoro/linux/cmake/build.sh
@@ -19,7 +19,7 @@
--cidfile $tmpfile \
-v $GIT_REPO_ROOT:/workspace \
$CONTAINER_IMAGE \
- /test.sh -Dprotobuf_BUILD_CONFORMANCE=ON
+ /test.sh -Dprotobuf_BUILD_CONFORMANCE=ON -Dprotobuf_BUILD_EXAMPLES=ON
# Save logs for Kokoro
docker cp \
diff --git a/kokoro/windows/bazel/build.bat b/kokoro/windows/bazel/build.bat
index 0b2ba9f..55fba16 100644
--- a/kokoro/windows/bazel/build.bat
+++ b/kokoro/windows/bazel/build.bat
@@ -24,7 +24,7 @@
@rem TODO(b/241484899) Enable conformance tests on windows.
bazel %BAZEL_STARTUP% test %BAZEL_FLAGS% ^
--test_tag_filters=-conformance --build_tag_filters=-conformance ^
- //src/... || goto :error
+ //src/... @com_google_protobuf_examples//... || goto :error
goto :EOF
diff --git a/kokoro/windows/cmake/build.bat b/kokoro/windows/cmake/build.bat
index 29d012b..49c89d3 100644
--- a/kokoro/windows/cmake/build.bat
+++ b/kokoro/windows/cmake/build.bat
@@ -13,6 +13,7 @@
cmake .. ^
-G "Visual Studio 15 2017" -A x64 ^
+ -Dprotobuf_BUILD_EXAMPLES=ON ^
-Dprotobuf_BUILD_CONFORMANCE=OFF ^
-Dprotobuf_WITH_ZLIB=OFF ^
-Dprotobuf_TEST_XML_OUTDIR=%KOKORO_ARTIFACTS_DIR%\logs\ || goto :error
