ADD: added new version of protobuf

libs/protobuf/kokoro/macos-next/cpp/build.sh

@@ -9,21 +9,47 @@ if [[ -h /tmpfs ]] && [[ ${PWD} == /tmpfs/src ]]; then
   cd /Volumes/BuildData/tmpfs/src
 fi
 
-# Default environment variables used by cmake build:
-: ${CMAKE_CONFIG_TYPE:=Debug}
-export CMAKE_CONFIG_TYPE
-: ${CTEST_PARALLEL_LEVEL:=4}
-export CTEST_PARALLEL_LEVEL
+# These vars can be changed when running manually, e.g.:
+#
+#   % BUILD_CONFIG=RelWithDebInfo path/to/build.sh
 
-# Run from the project root directory.
-cd $(dirname $0)/../../..
+# By default, build using Debug config.
+: ${BUILD_CONFIG:=Debug}
+
+# By default, find the sources based on this script path.
+: ${SOURCE_DIR:=$(cd $(dirname $0)/../../..; pwd)}
+
+# By default, put outputs under <git root>/cmake/build.
+: ${BUILD_DIR:=${SOURCE_DIR}/cmake/build}
+
+source ${SOURCE_DIR}/kokoro/caplog.sh
 
 #
 # Update submodules
 #
-git submodule update --init --recursive
+git -C "${SOURCE_DIR}" submodule update --init --recursive
 
 #
-# Run build
+# Configure and build in a separate directory
 #
-kokoro/common/cmake.sh
+mkdir -p "${BUILD_DIR}"
+
+caplog 01_configure \
+  cmake -S "${SOURCE_DIR}" -B "${BUILD_DIR}" ${CAPLOG_CMAKE_ARGS:-}
+
+if [[ -n ${CAPLOG_DIR:-} ]]; then
+  mkdir -p "${CAPLOG_DIR}/CMakeFiles"
+  cp "${BUILD_DIR}"/CMakeFiles/CMake*.log "${CAPLOG_DIR}/CMakeFiles"
+fi
+
+caplog 02_build \
+  cmake --build "${BUILD_DIR}" --config "${BUILD_CONFIG}"
+
+#
+# Run tests
+#
+(
+  cd "${BUILD_DIR}"
+  caplog 03_combined_testlog \
+    ctest -C "${BUILD_CONFIG}" -j4 ${CAPLOG_CTEST_ARGS:-}
+)

libs/protobuf/kokoro/macos-next/cpp/common.cfg

@@ -1,13 +0,0 @@
-# Config file for running tests in Kokoro
-
-# Location of the build script in repository
-build_file: "protobuf/kokoro/macos-next/cpp/build.sh"
-timeout_mins: 1440
-
-# Upload logs
-action: {
-  define_artifacts: {
-    regex: "**/*sponge_log.log"
-    regex: "**/*sponge_log.xml"
-  }
-}

libs/protobuf/kokoro/macos-next/cpp/continuous.cfg

@@ -1 +1,13 @@
-# Keep this file empty! Use common.cfg instead.
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/macos-next/cpp/build.sh"
+timeout_mins: 1440
+
+# Upload logs
+action: {
+  define_artifacts: {
+    regex: "**/*sponge_log.log"
+    regex: "**/*sponge_log.xml"
+  }
+}

libs/protobuf/kokoro/macos-next/cpp/presubmit.cfg

@@ -1 +1,13 @@
-# Keep this file empty! Use common.cfg instead.
+# Config file for running tests in Kokoro
+
+# Location of the build script in repository
+build_file: "protobuf/kokoro/macos-next/cpp/build.sh"
+timeout_mins: 1440
+
+# Upload logs
+action: {
+  define_artifacts: {
+    regex: "**/*sponge_log.log"
+    regex: "**/*sponge_log.xml"
+  }
+}