diff --git a/CHANGES.txt b/CHANGES.txt index cd2fbcc42f..9593319d0e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -12,6 +12,15 @@ * Use table-driven parser for reflection based objects. * Update Map's InternalSwap() to take a pointer to the other Map. * Add ARM-optimized Varint decoding functions. + * Minor optimization for parsing groups + * Declare ReflectiveProtoHook class + * Reduce size of VarintParse code in protocol buffers, by calling the shared + routine after handling just one-byte varint encoding inline, rather than + handling one-byte and two-byte varints inline. + * Avoid inlining some large heavily duplicated routines in repeated_ptr_field.h + * Add ReflectiveProtoHook to Reflection. + * Turns on table-driven parser for reflection based objects. + Kotlin * Suppress deprecation warnings in Kotlin generated code. diff --git a/kokoro/linux/32-bit/common.cfg b/kokoro/linux/32-bit/common.cfg new file mode 100644 index 0000000000..28b66c07c2 --- /dev/null +++ b/kokoro/linux/32-bit/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/32-bit/build.sh" +timeout_mins: 120 + +action { + define_artifacts { + regex: "**/sponge_log.xml" + } +} diff --git a/kokoro/linux/32-bit/continuous.cfg b/kokoro/linux/32-bit/continuous.cfg index 28b66c07c2..8523c22536 100644 --- a/kokoro/linux/32-bit/continuous.cfg +++ b/kokoro/linux/32-bit/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/32-bit/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/32-bit/presubmit.cfg b/kokoro/linux/32-bit/presubmit.cfg index 28b66c07c2..8523c22536 100644 --- a/kokoro/linux/32-bit/presubmit.cfg +++ b/kokoro/linux/32-bit/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/32-bit/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/bazel/common.cfg b/kokoro/linux/bazel/common.cfg new file mode 100644 index 0000000000..6d35d8bbaa --- /dev/null +++ b/kokoro/linux/bazel/common.cfg @@ -0,0 +1,16 @@ +# Default setup for the all of our Kokoro builds. + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 15 + +env_vars { + key: "BAZEL_TARGETS" + value: "//src/..." +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/bazel/continuous.cfg b/kokoro/linux/bazel/continuous.cfg index 21fe759f6e..8523c22536 100644 --- a/kokoro/linux/bazel/continuous.cfg +++ b/kokoro/linux/bazel/continuous.cfg @@ -1,16 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 15 - -env_vars { - key: "BAZEL_TARGETS" - value: "//src/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/bazel/presubmit.cfg b/kokoro/linux/bazel/presubmit.cfg index 103128b98d..8523c22536 100644 --- a/kokoro/linux/bazel/presubmit.cfg +++ b/kokoro/linux/bazel/presubmit.cfg @@ -1,16 +1 @@ -# Config file for running C++ Bazel tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 15 - -env_vars { - key: "BAZEL_TARGETS" - value: "//src/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake/common.cfg b/kokoro/linux/cmake/common.cfg new file mode 100644 index 0000000000..f03bd3945f --- /dev/null +++ b/kokoro/linux/cmake/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/cmake/build.sh" +timeout_mins: 1440 + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/cmake/continuous.cfg b/kokoro/linux/cmake/continuous.cfg index f03bd3945f..8523c22536 100644 --- a/kokoro/linux/cmake/continuous.cfg +++ b/kokoro/linux/cmake/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake/presubmit.cfg b/kokoro/linux/cmake/presubmit.cfg index f03bd3945f..8523c22536 100644 --- a/kokoro/linux/cmake/presubmit.cfg +++ b/kokoro/linux/cmake/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_install/common.cfg b/kokoro/linux/cmake_install/common.cfg new file mode 100644 index 0000000000..f1ae0b351f --- /dev/null +++ b/kokoro/linux/cmake_install/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/cmake_install/build.sh" +timeout_mins: 1440 + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/cmake_install/continuous.cfg b/kokoro/linux/cmake_install/continuous.cfg index f1ae0b351f..8523c22536 100644 --- a/kokoro/linux/cmake_install/continuous.cfg +++ b/kokoro/linux/cmake_install/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake_install/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_install/presubmit.cfg b/kokoro/linux/cmake_install/presubmit.cfg index f1ae0b351f..8523c22536 100644 --- a/kokoro/linux/cmake_install/presubmit.cfg +++ b/kokoro/linux/cmake_install/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake_install/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_ninja/common.cfg b/kokoro/linux/cmake_ninja/common.cfg new file mode 100644 index 0000000000..144fc90a82 --- /dev/null +++ b/kokoro/linux/cmake_ninja/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/cmake_ninja/build.sh" +timeout_mins: 1440 + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/cmake_ninja/continuous.cfg b/kokoro/linux/cmake_ninja/continuous.cfg index 144fc90a82..8523c22536 100644 --- a/kokoro/linux/cmake_ninja/continuous.cfg +++ b/kokoro/linux/cmake_ninja/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake_ninja/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_ninja/presubmit.cfg b/kokoro/linux/cmake_ninja/presubmit.cfg index 144fc90a82..8523c22536 100644 --- a/kokoro/linux/cmake_ninja/presubmit.cfg +++ b/kokoro/linux/cmake_ninja/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake_ninja/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_shared/common.cfg b/kokoro/linux/cmake_shared/common.cfg new file mode 100644 index 0000000000..f03bd3945f --- /dev/null +++ b/kokoro/linux/cmake_shared/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/cmake/build.sh" +timeout_mins: 1440 + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/cmake_shared/continuous.cfg b/kokoro/linux/cmake_shared/continuous.cfg index f03bd3945f..8523c22536 100644 --- a/kokoro/linux/cmake_shared/continuous.cfg +++ b/kokoro/linux/cmake_shared/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cmake_shared/presubmit.cfg b/kokoro/linux/cmake_shared/presubmit.cfg index f03bd3945f..8523c22536 100644 --- a/kokoro/linux/cmake_shared/presubmit.cfg +++ b/kokoro/linux/cmake_shared/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/cmake/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cpp_aarch64/common.cfg b/kokoro/linux/cpp_aarch64/common.cfg new file mode 100644 index 0000000000..f77f73b928 --- /dev/null +++ b/kokoro/linux/cpp_aarch64/common.cfg @@ -0,0 +1,21 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//src/..." +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/cpp_aarch64/continuous.cfg b/kokoro/linux/cpp_aarch64/continuous.cfg index f77f73b928..8523c22536 100644 --- a/kokoro/linux/cpp_aarch64/continuous.cfg +++ b/kokoro/linux/cpp_aarch64/continuous.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//src/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cpp_aarch64/presubmit.cfg b/kokoro/linux/cpp_aarch64/presubmit.cfg index f77f73b928..8523c22536 100644 --- a/kokoro/linux/cpp_aarch64/presubmit.cfg +++ b/kokoro/linux/cpp_aarch64/presubmit.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//src/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cpp_tcmalloc/common.cfg b/kokoro/linux/cpp_tcmalloc/common.cfg new file mode 100644 index 0000000000..fb76204e90 --- /dev/null +++ b/kokoro/linux/cpp_tcmalloc/common.cfg @@ -0,0 +1,21 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 1440 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/tcmalloc/linux:64e8944e4f18d7d6c9649112a8a93be57e693cd8" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//src/..." +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/cpp_tcmalloc/continuous.cfg b/kokoro/linux/cpp_tcmalloc/continuous.cfg index fb76204e90..8523c22536 100644 --- a/kokoro/linux/cpp_tcmalloc/continuous.cfg +++ b/kokoro/linux/cpp_tcmalloc/continuous.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 1440 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/tcmalloc/linux:64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//src/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/cpp_tcmalloc/presubmit.cfg b/kokoro/linux/cpp_tcmalloc/presubmit.cfg index fb76204e90..8523c22536 100644 --- a/kokoro/linux/cpp_tcmalloc/presubmit.cfg +++ b/kokoro/linux/cpp_tcmalloc/presubmit.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 1440 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/tcmalloc/linux:64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//src/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/csharp/common.cfg b/kokoro/linux/csharp/common.cfg new file mode 100644 index 0000000000..2332c00dce --- /dev/null +++ b/kokoro/linux/csharp/common.cfg @@ -0,0 +1,27 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 1440 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/csharp/linux:3.1.415-6.0.100-6bbe70439ba5b0404bb12662cebc0296909389fa" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//csharp/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 " + "--test_env=DOTNET_CLI_HOME=/home/bazel" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/csharp/continuous.cfg b/kokoro/linux/csharp/continuous.cfg index 2332c00dce..8523c22536 100644 --- a/kokoro/linux/csharp/continuous.cfg +++ b/kokoro/linux/csharp/continuous.cfg @@ -1,27 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 1440 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/csharp/linux:3.1.415-6.0.100-6bbe70439ba5b0404bb12662cebc0296909389fa" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//csharp/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 " - "--test_env=DOTNET_CLI_HOME=/home/bazel" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/csharp/presubmit.cfg b/kokoro/linux/csharp/presubmit.cfg index 2332c00dce..8523c22536 100644 --- a/kokoro/linux/csharp/presubmit.cfg +++ b/kokoro/linux/csharp/presubmit.cfg @@ -1,27 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 1440 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/csharp/linux:3.1.415-6.0.100-6bbe70439ba5b0404bb12662cebc0296909389fa" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//csharp/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--action_env=DOTNET_CLI_TELEMETRY_OPTOUT=1 " - "--test_env=DOTNET_CLI_HOME=/home/bazel" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/csharp_aarch64/common.cfg b/kokoro/linux/csharp_aarch64/common.cfg new file mode 100644 index 0000000000..df28ef368f --- /dev/null +++ b/kokoro/linux/csharp_aarch64/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/csharp_aarch64/build.sh" +timeout_mins: 120 + +action { + define_artifacts { + regex: "**/sponge_log.xml" + } +} diff --git a/kokoro/linux/csharp_aarch64/continuous.cfg b/kokoro/linux/csharp_aarch64/continuous.cfg index df28ef368f..8523c22536 100644 --- a/kokoro/linux/csharp_aarch64/continuous.cfg +++ b/kokoro/linux/csharp_aarch64/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/csharp_aarch64/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/csharp_aarch64/presubmit.cfg b/kokoro/linux/csharp_aarch64/presubmit.cfg index df28ef368f..8523c22536 100644 --- a/kokoro/linux/csharp_aarch64/presubmit.cfg +++ b/kokoro/linux/csharp_aarch64/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/csharp_aarch64/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/java_aarch64/common.cfg b/kokoro/linux/java_aarch64/common.cfg new file mode 100644 index 0000000000..75e3f0bddb --- /dev/null +++ b/kokoro/linux/java_aarch64/common.cfg @@ -0,0 +1,21 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//java/..." +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/java_aarch64/continuous.cfg b/kokoro/linux/java_aarch64/continuous.cfg index 75e3f0bddb..8523c22536 100644 --- a/kokoro/linux/java_aarch64/continuous.cfg +++ b/kokoro/linux/java_aarch64/continuous.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//java/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/java_aarch64/presubmit.cfg b/kokoro/linux/java_aarch64/presubmit.cfg index bca25d1ea5..8523c22536 100644 --- a/kokoro/linux/java_aarch64/presubmit.cfg +++ b/kokoro/linux/java_aarch64/presubmit.cfg @@ -1,20 +1 @@ -# Config file for running tests in Kokoro - -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/emulation/linux:aarch64-4e847d7a01c1792471b6dd985ab0bf2677332e6f" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//java/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/java_jdk11/common.cfg b/kokoro/linux/java_jdk11/common.cfg new file mode 100644 index 0000000000..3db5cd0fd4 --- /dev/null +++ b/kokoro/linux/java_jdk11/common.cfg @@ -0,0 +1,16 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "BAZEL_TARGETS" + value: "//java/..." +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/java_jdk11/continuous.cfg b/kokoro/linux/java_jdk11/continuous.cfg index 3db5cd0fd4..8523c22536 100644 --- a/kokoro/linux/java_jdk11/continuous.cfg +++ b/kokoro/linux/java_jdk11/continuous.cfg @@ -1,16 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "BAZEL_TARGETS" - value: "//java/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/java_jdk11/presubmit.cfg b/kokoro/linux/java_jdk11/presubmit.cfg index 04d8214b67..8523c22536 100644 --- a/kokoro/linux/java_jdk11/presubmit.cfg +++ b/kokoro/linux/java_jdk11/presubmit.cfg @@ -1,16 +1 @@ -# Config file for running Linkage Monitor in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "BAZEL_TARGETS" - value: "//java/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/java_jdk17/common.cfg b/kokoro/linux/java_jdk17/common.cfg new file mode 100644 index 0000000000..cd31eda405 --- /dev/null +++ b/kokoro/linux/java_jdk17/common.cfg @@ -0,0 +1,21 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/java/linux:17-64e8944e4f18d7d6c9649112a8a93be57e693cd8" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//java/..." +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/java_jdk17/continuous.cfg b/kokoro/linux/java_jdk17/continuous.cfg index cd31eda405..8523c22536 100644 --- a/kokoro/linux/java_jdk17/continuous.cfg +++ b/kokoro/linux/java_jdk17/continuous.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/java/linux:17-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//java/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/java_jdk17/presubmit.cfg b/kokoro/linux/java_jdk17/presubmit.cfg index 4574a0fd1c..8523c22536 100644 --- a/kokoro/linux/java_jdk17/presubmit.cfg +++ b/kokoro/linux/java_jdk17/presubmit.cfg @@ -1,21 +1 @@ -# Config file for running Linkage Monitor in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/java/linux:17-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//java/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/java_linkage_monitor/common.cfg b/kokoro/linux/java_linkage_monitor/common.cfg new file mode 100644 index 0000000000..c02a52f0fa --- /dev/null +++ b/kokoro/linux/java_linkage_monitor/common.cfg @@ -0,0 +1,12 @@ +# Config file for running Linkage Monitor in Kokoro +# https://github.com/GoogleCloudPlatform/cloud-opensource-java/tree/master/linkage-monitor + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/java_linkage_monitor/build.sh" +timeout_mins: 120 + +action { + define_artifacts { + regex: "**/sponge_log.xml" + } +} diff --git a/kokoro/linux/java_linkage_monitor/continuous.cfg b/kokoro/linux/java_linkage_monitor/continuous.cfg index d0486cce41..8523c22536 100644 --- a/kokoro/linux/java_linkage_monitor/continuous.cfg +++ b/kokoro/linux/java_linkage_monitor/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/java_linkage_monitor/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/java_linkage_monitor/presubmit.cfg b/kokoro/linux/java_linkage_monitor/presubmit.cfg index c02a52f0fa..8523c22536 100644 --- a/kokoro/linux/java_linkage_monitor/presubmit.cfg +++ b/kokoro/linux/java_linkage_monitor/presubmit.cfg @@ -1,12 +1 @@ -# Config file for running Linkage Monitor in Kokoro -# https://github.com/GoogleCloudPlatform/cloud-opensource-java/tree/master/linkage-monitor - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/java_linkage_monitor/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/jruby92/common.cfg b/kokoro/linux/jruby92/common.cfg new file mode 100644 index 0000000000..9db8f50637 --- /dev/null +++ b/kokoro/linux/jruby92/common.cfg @@ -0,0 +1,26 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/ruby/linux:jruby-9.2.20.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//ruby/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--define=ruby_platform=java" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/jruby92/continuous.cfg b/kokoro/linux/jruby92/continuous.cfg index 9db8f50637..8523c22536 100644 --- a/kokoro/linux/jruby92/continuous.cfg +++ b/kokoro/linux/jruby92/continuous.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:jruby-9.2.20.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=java" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/jruby92/presubmit.cfg b/kokoro/linux/jruby92/presubmit.cfg index 9db8f50637..8523c22536 100644 --- a/kokoro/linux/jruby92/presubmit.cfg +++ b/kokoro/linux/jruby92/presubmit.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:jruby-9.2.20.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=java" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/jruby93/common.cfg b/kokoro/linux/jruby93/common.cfg new file mode 100644 index 0000000000..a5a9bd2374 --- /dev/null +++ b/kokoro/linux/jruby93/common.cfg @@ -0,0 +1,26 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/ruby/linux:jruby-9.3.4.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//ruby/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--define=ruby_platform=java" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/jruby93/continuous.cfg b/kokoro/linux/jruby93/continuous.cfg index a5a9bd2374..8523c22536 100644 --- a/kokoro/linux/jruby93/continuous.cfg +++ b/kokoro/linux/jruby93/continuous.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:jruby-9.3.4.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=java" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/jruby93/presubmit.cfg b/kokoro/linux/jruby93/presubmit.cfg index a5a9bd2374..8523c22536 100644 --- a/kokoro/linux/jruby93/presubmit.cfg +++ b/kokoro/linux/jruby93/presubmit.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:jruby-9.3.4.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=java" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/php_aarch64/common.cfg b/kokoro/linux/php_aarch64/common.cfg new file mode 100644 index 0000000000..ff20682dfb --- /dev/null +++ b/kokoro/linux/php_aarch64/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/php_aarch64/build.sh" +timeout_mins: 120 + +action { + define_artifacts { + regex: "**/sponge_log.xml" + } +} diff --git a/kokoro/linux/php_aarch64/continuous.cfg b/kokoro/linux/php_aarch64/continuous.cfg index ff20682dfb..8523c22536 100644 --- a/kokoro/linux/php_aarch64/continuous.cfg +++ b/kokoro/linux/php_aarch64/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/php_aarch64/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/php_aarch64/presubmit.cfg b/kokoro/linux/php_aarch64/presubmit.cfg index ff20682dfb..8523c22536 100644 --- a/kokoro/linux/php_aarch64/presubmit.cfg +++ b/kokoro/linux/php_aarch64/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/php_aarch64/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/php_all/common.cfg b/kokoro/linux/php_all/common.cfg new file mode 100644 index 0000000000..dfa8037ef8 --- /dev/null +++ b/kokoro/linux/php_all/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/php_all/build.sh" +timeout_mins: 120 + +action { + define_artifacts { + regex: "**/sponge_log.xml" + } +} diff --git a/kokoro/linux/php_all/continuous.cfg b/kokoro/linux/php_all/continuous.cfg index dfa8037ef8..8523c22536 100644 --- a/kokoro/linux/php_all/continuous.cfg +++ b/kokoro/linux/php_all/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/php_all/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/php_all/presubmit.cfg b/kokoro/linux/php_all/presubmit.cfg index dfa8037ef8..8523c22536 100644 --- a/kokoro/linux/php_all/presubmit.cfg +++ b/kokoro/linux/php_all/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/php_all/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python310/common.cfg b/kokoro/linux/python310/common.cfg new file mode 100644 index 0000000000..7e4a798ddd --- /dev/null +++ b/kokoro/linux/python310/common.cfg @@ -0,0 +1,21 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//python/... @upb//python/..." +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/python310/continuous.cfg b/kokoro/linux/python310/continuous.cfg index 7e4a798ddd..8523c22536 100644 --- a/kokoro/linux/python310/continuous.cfg +++ b/kokoro/linux/python310/continuous.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//python/... @upb//python/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python310/presubmit.cfg b/kokoro/linux/python310/presubmit.cfg index 7e4a798ddd..8523c22536 100644 --- a/kokoro/linux/python310/presubmit.cfg +++ b/kokoro/linux/python310/presubmit.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//python/... @upb//python/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python310_cpp/common.cfg b/kokoro/linux/python310_cpp/common.cfg new file mode 100644 index 0000000000..5b87fd6c51 --- /dev/null +++ b/kokoro/linux/python310_cpp/common.cfg @@ -0,0 +1,27 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee" +} + +env_vars { + key: "BAZEL_TARGETS" + # Note: upb tests don't work since the C++ extension takes precedence here. + value: "//python/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--define=use_fast_cpp_protos=true" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/python310_cpp/continuous.cfg b/kokoro/linux/python310_cpp/continuous.cfg index e76abe18a0..8523c22536 100644 --- a/kokoro/linux/python310_cpp/continuous.cfg +++ b/kokoro/linux/python310_cpp/continuous.cfg @@ -1,28 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - # Note: upb tests don't work since the C++ extension takes precedence here. - # Note: upb tests don't work since the C++ extension takes precedence here. - value: "//python/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=use_fast_cpp_protos=true" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python310_cpp/presubmit.cfg b/kokoro/linux/python310_cpp/presubmit.cfg index 5b87fd6c51..8523c22536 100644 --- a/kokoro/linux/python310_cpp/presubmit.cfg +++ b/kokoro/linux/python310_cpp/presubmit.cfg @@ -1,27 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.10-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - # Note: upb tests don't work since the C++ extension takes precedence here. - value: "//python/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=use_fast_cpp_protos=true" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python37/common.cfg b/kokoro/linux/python37/common.cfg new file mode 100644 index 0000000000..3ae100cb00 --- /dev/null +++ b/kokoro/linux/python37/common.cfg @@ -0,0 +1,21 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//python/... @upb//python/..." +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/python37/continuous.cfg b/kokoro/linux/python37/continuous.cfg index 3ae100cb00..8523c22536 100644 --- a/kokoro/linux/python37/continuous.cfg +++ b/kokoro/linux/python37/continuous.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//python/... @upb//python/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python37/presubmit.cfg b/kokoro/linux/python37/presubmit.cfg index 3ae100cb00..8523c22536 100644 --- a/kokoro/linux/python37/presubmit.cfg +++ b/kokoro/linux/python37/presubmit.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//python/... @upb//python/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python37_cpp/common.cfg b/kokoro/linux/python37_cpp/common.cfg new file mode 100644 index 0000000000..ebef92806f --- /dev/null +++ b/kokoro/linux/python37_cpp/common.cfg @@ -0,0 +1,27 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee" +} + +env_vars { + key: "BAZEL_TARGETS" + # Note: upb tests don't work since the C++ extension takes precedence here. + value: "//python/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--define=use_fast_cpp_protos=true" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/python37_cpp/continuous.cfg b/kokoro/linux/python37_cpp/continuous.cfg index ebef92806f..8523c22536 100644 --- a/kokoro/linux/python37_cpp/continuous.cfg +++ b/kokoro/linux/python37_cpp/continuous.cfg @@ -1,27 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - # Note: upb tests don't work since the C++ extension takes precedence here. - value: "//python/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=use_fast_cpp_protos=true" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python37_cpp/presubmit.cfg b/kokoro/linux/python37_cpp/presubmit.cfg index ebef92806f..8523c22536 100644 --- a/kokoro/linux/python37_cpp/presubmit.cfg +++ b/kokoro/linux/python37_cpp/presubmit.cfg @@ -1,27 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.7-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - # Note: upb tests don't work since the C++ extension takes precedence here. - value: "//python/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=use_fast_cpp_protos=true" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python38/common.cfg b/kokoro/linux/python38/common.cfg new file mode 100644 index 0000000000..7d9e7aaadb --- /dev/null +++ b/kokoro/linux/python38/common.cfg @@ -0,0 +1,21 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//python/... @upb//python/..." +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/python38/continuous.cfg b/kokoro/linux/python38/continuous.cfg index 7d9e7aaadb..8523c22536 100644 --- a/kokoro/linux/python38/continuous.cfg +++ b/kokoro/linux/python38/continuous.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//python/... @upb//python/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python38/presubmit.cfg b/kokoro/linux/python38/presubmit.cfg index 7d9e7aaadb..8523c22536 100644 --- a/kokoro/linux/python38/presubmit.cfg +++ b/kokoro/linux/python38/presubmit.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//python/... @upb//python/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python38_cpp/common.cfg b/kokoro/linux/python38_cpp/common.cfg new file mode 100644 index 0000000000..decd466494 --- /dev/null +++ b/kokoro/linux/python38_cpp/common.cfg @@ -0,0 +1,27 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee" +} + +env_vars { + key: "BAZEL_TARGETS" + # Note: upb tests don't work since the C++ extension takes precedence here. + value: "//python/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--define=use_fast_cpp_protos=true" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/python38_cpp/continuous.cfg b/kokoro/linux/python38_cpp/continuous.cfg index decd466494..8523c22536 100644 --- a/kokoro/linux/python38_cpp/continuous.cfg +++ b/kokoro/linux/python38_cpp/continuous.cfg @@ -1,27 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - # Note: upb tests don't work since the C++ extension takes precedence here. - value: "//python/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=use_fast_cpp_protos=true" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python38_cpp/presubmit.cfg b/kokoro/linux/python38_cpp/presubmit.cfg index decd466494..8523c22536 100644 --- a/kokoro/linux/python38_cpp/presubmit.cfg +++ b/kokoro/linux/python38_cpp/presubmit.cfg @@ -1,27 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.8-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - # Note: upb tests don't work since the C++ extension takes precedence here. - value: "//python/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=use_fast_cpp_protos=true" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python39/common.cfg b/kokoro/linux/python39/common.cfg new file mode 100644 index 0000000000..5133ab5629 --- /dev/null +++ b/kokoro/linux/python39/common.cfg @@ -0,0 +1,21 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//python/... @upb//python/..." +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/python39/continuous.cfg b/kokoro/linux/python39/continuous.cfg index 5133ab5629..8523c22536 100644 --- a/kokoro/linux/python39/continuous.cfg +++ b/kokoro/linux/python39/continuous.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//python/... @upb//python/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python39/presubmit.cfg b/kokoro/linux/python39/presubmit.cfg index 5133ab5629..8523c22536 100644 --- a/kokoro/linux/python39/presubmit.cfg +++ b/kokoro/linux/python39/presubmit.cfg @@ -1,21 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//python/... @upb//python/..." -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python39_cpp/common.cfg b/kokoro/linux/python39_cpp/common.cfg new file mode 100644 index 0000000000..97970087b0 --- /dev/null +++ b/kokoro/linux/python39_cpp/common.cfg @@ -0,0 +1,27 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee" +} + +env_vars { + key: "BAZEL_TARGETS" + # Note: upb tests don't work since the C++ extension takes precedence here. + value: "//python/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--define=use_fast_cpp_protos=true" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/python39_cpp/continuous.cfg b/kokoro/linux/python39_cpp/continuous.cfg index 97970087b0..8523c22536 100644 --- a/kokoro/linux/python39_cpp/continuous.cfg +++ b/kokoro/linux/python39_cpp/continuous.cfg @@ -1,27 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - # Note: upb tests don't work since the C++ extension takes precedence here. - value: "//python/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=use_fast_cpp_protos=true" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python39_cpp/presubmit.cfg b/kokoro/linux/python39_cpp/presubmit.cfg index 97970087b0..8523c22536 100644 --- a/kokoro/linux/python39_cpp/presubmit.cfg +++ b/kokoro/linux/python39_cpp/presubmit.cfg @@ -1,27 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/python/linux:3.9-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - # Note: upb tests don't work since the C++ extension takes precedence here. - value: "//python/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=use_fast_cpp_protos=true" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python_aarch64/common.cfg b/kokoro/linux/python_aarch64/common.cfg new file mode 100644 index 0000000000..dee4a47367 --- /dev/null +++ b/kokoro/linux/python_aarch64/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/python_aarch64/build.sh" +timeout_mins: 120 + +action { + define_artifacts { + regex: "**/sponge_log.xml" + } +} diff --git a/kokoro/linux/python_aarch64/continuous.cfg b/kokoro/linux/python_aarch64/continuous.cfg index dee4a47367..8523c22536 100644 --- a/kokoro/linux/python_aarch64/continuous.cfg +++ b/kokoro/linux/python_aarch64/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/python_aarch64/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/python_aarch64/presubmit.cfg b/kokoro/linux/python_aarch64/presubmit.cfg index dee4a47367..8523c22536 100644 --- a/kokoro/linux/python_aarch64/presubmit.cfg +++ b/kokoro/linux/python_aarch64/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/python_aarch64/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby25/common.cfg b/kokoro/linux/ruby25/common.cfg new file mode 100644 index 0000000000..ec975cd7d2 --- /dev/null +++ b/kokoro/linux/ruby25/common.cfg @@ -0,0 +1,26 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/ruby/linux:ruby-2.5.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//ruby/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--define=ruby_platform=c" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/ruby25/continuous.cfg b/kokoro/linux/ruby25/continuous.cfg index ec975cd7d2..8523c22536 100644 --- a/kokoro/linux/ruby25/continuous.cfg +++ b/kokoro/linux/ruby25/continuous.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-2.5.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=c" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby25/presubmit.cfg b/kokoro/linux/ruby25/presubmit.cfg index ec975cd7d2..8523c22536 100644 --- a/kokoro/linux/ruby25/presubmit.cfg +++ b/kokoro/linux/ruby25/presubmit.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-2.5.1-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=c" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby26/common.cfg b/kokoro/linux/ruby26/common.cfg new file mode 100644 index 0000000000..d09a405d8c --- /dev/null +++ b/kokoro/linux/ruby26/common.cfg @@ -0,0 +1,26 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/ruby/linux:ruby-2.6.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//ruby/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--define=ruby_platform=c" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/ruby26/continuous.cfg b/kokoro/linux/ruby26/continuous.cfg index d09a405d8c..8523c22536 100644 --- a/kokoro/linux/ruby26/continuous.cfg +++ b/kokoro/linux/ruby26/continuous.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-2.6.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=c" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby26/presubmit.cfg b/kokoro/linux/ruby26/presubmit.cfg index d09a405d8c..8523c22536 100644 --- a/kokoro/linux/ruby26/presubmit.cfg +++ b/kokoro/linux/ruby26/presubmit.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-2.6.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=c" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby27/common.cfg b/kokoro/linux/ruby27/common.cfg new file mode 100644 index 0000000000..51afa75d27 --- /dev/null +++ b/kokoro/linux/ruby27/common.cfg @@ -0,0 +1,26 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/ruby/linux:ruby-2.7.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//ruby/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--define=ruby_platform=c" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/ruby27/continuous.cfg b/kokoro/linux/ruby27/continuous.cfg index 51afa75d27..8523c22536 100644 --- a/kokoro/linux/ruby27/continuous.cfg +++ b/kokoro/linux/ruby27/continuous.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-2.7.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=c" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby27/presubmit.cfg b/kokoro/linux/ruby27/presubmit.cfg index 51afa75d27..8523c22536 100644 --- a/kokoro/linux/ruby27/presubmit.cfg +++ b/kokoro/linux/ruby27/presubmit.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-2.7.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=c" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby30/common.cfg b/kokoro/linux/ruby30/common.cfg new file mode 100644 index 0000000000..338505e57e --- /dev/null +++ b/kokoro/linux/ruby30/common.cfg @@ -0,0 +1,26 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/ruby/linux:ruby-3.0.2-2f706fd1ab49f4e97af769388be486069b63efee" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//ruby/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--define=ruby_platform=c" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/ruby30/continuous.cfg b/kokoro/linux/ruby30/continuous.cfg index 338505e57e..8523c22536 100644 --- a/kokoro/linux/ruby30/continuous.cfg +++ b/kokoro/linux/ruby30/continuous.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-3.0.2-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=c" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby30/presubmit.cfg b/kokoro/linux/ruby30/presubmit.cfg index 338505e57e..8523c22536 100644 --- a/kokoro/linux/ruby30/presubmit.cfg +++ b/kokoro/linux/ruby30/presubmit.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-3.0.2-2f706fd1ab49f4e97af769388be486069b63efee" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=c" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby31/common.cfg b/kokoro/linux/ruby31/common.cfg new file mode 100644 index 0000000000..588fe13637 --- /dev/null +++ b/kokoro/linux/ruby31/common.cfg @@ -0,0 +1,26 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/bazel.sh" +timeout_mins: 120 + +env_vars { + key: "CONTAINER_IMAGE" + value: "gcr.io/protobuf-build/ruby/linux:ruby-3.1.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" +} + +env_vars { + key: "BAZEL_TARGETS" + value: "//ruby/..." +} + +env_vars { + key: "BAZEL_EXTRA_FLAGS" + value: "--define=ruby_platform=c" +} + +action { + define_artifacts { + regex: "**/sponge_log.*" + } +} diff --git a/kokoro/linux/ruby31/continuous.cfg b/kokoro/linux/ruby31/continuous.cfg index 588fe13637..8523c22536 100644 --- a/kokoro/linux/ruby31/continuous.cfg +++ b/kokoro/linux/ruby31/continuous.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-3.1.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=c" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby31/presubmit.cfg b/kokoro/linux/ruby31/presubmit.cfg index 588fe13637..8523c22536 100644 --- a/kokoro/linux/ruby31/presubmit.cfg +++ b/kokoro/linux/ruby31/presubmit.cfg @@ -1,26 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/bazel.sh" -timeout_mins: 120 - -env_vars { - key: "CONTAINER_IMAGE" - value: "gcr.io/protobuf-build/ruby/linux:ruby-3.1.0-64e8944e4f18d7d6c9649112a8a93be57e693cd8" -} - -env_vars { - key: "BAZEL_TARGETS" - value: "//ruby/..." -} - -env_vars { - key: "BAZEL_EXTRA_FLAGS" - value: "--define=ruby_platform=c" -} - -action { - define_artifacts { - regex: "**/sponge_log.*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby_aarch64/common.cfg b/kokoro/linux/ruby_aarch64/common.cfg new file mode 100644 index 0000000000..ae82696404 --- /dev/null +++ b/kokoro/linux/ruby_aarch64/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh" +timeout_mins: 120 + +action { + define_artifacts { + regex: "**/sponge_log.xml" + } +} diff --git a/kokoro/linux/ruby_aarch64/continuous.cfg b/kokoro/linux/ruby_aarch64/continuous.cfg index ae82696404..8523c22536 100644 --- a/kokoro/linux/ruby_aarch64/continuous.cfg +++ b/kokoro/linux/ruby_aarch64/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/linux/ruby_aarch64/presubmit.cfg b/kokoro/linux/ruby_aarch64/presubmit.cfg index ae82696404..8523c22536 100644 --- a/kokoro/linux/ruby_aarch64/presubmit.cfg +++ b/kokoro/linux/ruby_aarch64/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/ruby_aarch64/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos-next/cpp/common.cfg b/kokoro/macos-next/cpp/common.cfg new file mode 100644 index 0000000000..166caa5f91 --- /dev/null +++ b/kokoro/macos-next/cpp/common.cfg @@ -0,0 +1,13 @@ +# 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" + } +} diff --git a/kokoro/macos-next/cpp/continuous.cfg b/kokoro/macos-next/cpp/continuous.cfg index 166caa5f91..8523c22536 100644 --- a/kokoro/macos-next/cpp/continuous.cfg +++ b/kokoro/macos-next/cpp/continuous.cfg @@ -1,13 +1 @@ -# 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" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos-next/cpp/presubmit.cfg b/kokoro/macos-next/cpp/presubmit.cfg index 166caa5f91..8523c22536 100644 --- a/kokoro/macos-next/cpp/presubmit.cfg +++ b/kokoro/macos-next/cpp/presubmit.cfg @@ -1,13 +1 @@ -# 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" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/cpp/common.cfg b/kokoro/macos/cpp/common.cfg new file mode 100644 index 0000000000..4bea1cbbb1 --- /dev/null +++ b/kokoro/macos/cpp/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/cpp/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/cpp/continuous.cfg b/kokoro/macos/cpp/continuous.cfg index 4bea1cbbb1..8523c22536 100644 --- a/kokoro/macos/cpp/continuous.cfg +++ b/kokoro/macos/cpp/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/cpp/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/cpp/presubmit.cfg b/kokoro/macos/cpp/presubmit.cfg index 4bea1cbbb1..8523c22536 100644 --- a/kokoro/macos/cpp/presubmit.cfg +++ b/kokoro/macos/cpp/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/cpp/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/objectivec_ios_debug/common.cfg b/kokoro/macos/objectivec_ios_debug/common.cfg new file mode 100644 index 0000000000..473d54554a --- /dev/null +++ b/kokoro/macos/objectivec_ios_debug/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/objectivec_ios_debug/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/objectivec_ios_debug/continuous.cfg b/kokoro/macos/objectivec_ios_debug/continuous.cfg index 473d54554a..8523c22536 100644 --- a/kokoro/macos/objectivec_ios_debug/continuous.cfg +++ b/kokoro/macos/objectivec_ios_debug/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/objectivec_ios_debug/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/objectivec_ios_debug/presubmit.cfg b/kokoro/macos/objectivec_ios_debug/presubmit.cfg index 473d54554a..8523c22536 100644 --- a/kokoro/macos/objectivec_ios_debug/presubmit.cfg +++ b/kokoro/macos/objectivec_ios_debug/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/objectivec_ios_debug/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/objectivec_ios_release/common.cfg b/kokoro/macos/objectivec_ios_release/common.cfg new file mode 100644 index 0000000000..3cbfb685d8 --- /dev/null +++ b/kokoro/macos/objectivec_ios_release/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/objectivec_ios_release/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/objectivec_ios_release/continuous.cfg b/kokoro/macos/objectivec_ios_release/continuous.cfg index 3cbfb685d8..8523c22536 100644 --- a/kokoro/macos/objectivec_ios_release/continuous.cfg +++ b/kokoro/macos/objectivec_ios_release/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/objectivec_ios_release/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/objectivec_ios_release/presubmit.cfg b/kokoro/macos/objectivec_ios_release/presubmit.cfg index 3cbfb685d8..8523c22536 100644 --- a/kokoro/macos/objectivec_ios_release/presubmit.cfg +++ b/kokoro/macos/objectivec_ios_release/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/objectivec_ios_release/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/objectivec_osx/common.cfg b/kokoro/macos/objectivec_osx/common.cfg new file mode 100644 index 0000000000..41bd46aa87 --- /dev/null +++ b/kokoro/macos/objectivec_osx/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/objectivec_osx/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/objectivec_osx/continuous.cfg b/kokoro/macos/objectivec_osx/continuous.cfg index 41bd46aa87..8523c22536 100644 --- a/kokoro/macos/objectivec_osx/continuous.cfg +++ b/kokoro/macos/objectivec_osx/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/objectivec_osx/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/objectivec_osx/presubmit.cfg b/kokoro/macos/objectivec_osx/presubmit.cfg index 41bd46aa87..8523c22536 100644 --- a/kokoro/macos/objectivec_osx/presubmit.cfg +++ b/kokoro/macos/objectivec_osx/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/objectivec_osx/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/php74/common.cfg b/kokoro/macos/php74/common.cfg new file mode 100644 index 0000000000..cf7e80beb8 --- /dev/null +++ b/kokoro/macos/php74/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/php74/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/php74/continuous.cfg b/kokoro/macos/php74/continuous.cfg index cf7e80beb8..8523c22536 100644 --- a/kokoro/macos/php74/continuous.cfg +++ b/kokoro/macos/php74/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/php74/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/php74/presubmit.cfg b/kokoro/macos/php74/presubmit.cfg index cf7e80beb8..8523c22536 100644 --- a/kokoro/macos/php74/presubmit.cfg +++ b/kokoro/macos/php74/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/php74/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/php80/common.cfg b/kokoro/macos/php80/common.cfg new file mode 100644 index 0000000000..ded43e62c5 --- /dev/null +++ b/kokoro/macos/php80/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/php80/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/php80/continuous.cfg b/kokoro/macos/php80/continuous.cfg index ded43e62c5..8523c22536 100644 --- a/kokoro/macos/php80/continuous.cfg +++ b/kokoro/macos/php80/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/php80/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/php80/presubmit.cfg b/kokoro/macos/php80/presubmit.cfg index ded43e62c5..8523c22536 100644 --- a/kokoro/macos/php80/presubmit.cfg +++ b/kokoro/macos/php80/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/php80/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/python/common.cfg b/kokoro/macos/python/common.cfg new file mode 100644 index 0000000000..ac3cbeebf5 --- /dev/null +++ b/kokoro/macos/python/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/python/build.sh" +timeout_mins: 1440 + +action { + define_artifacts { + regex: "**/*" + } +} diff --git a/kokoro/macos/python/continuous.cfg b/kokoro/macos/python/continuous.cfg index 0fc8b503e8..8523c22536 100644 --- a/kokoro/macos/python/continuous.cfg +++ b/kokoro/macos/python/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/python/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/python/presubmit.cfg b/kokoro/macos/python/presubmit.cfg index ac3cbeebf5..8523c22536 100644 --- a/kokoro/macos/python/presubmit.cfg +++ b/kokoro/macos/python/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/python/build.sh" -timeout_mins: 1440 - -action { - define_artifacts { - regex: "**/*" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/python_cpp/common.cfg b/kokoro/macos/python_cpp/common.cfg new file mode 100644 index 0000000000..22f4a0e4c9 --- /dev/null +++ b/kokoro/macos/python_cpp/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/python_cpp/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/python_cpp/continuous.cfg b/kokoro/macos/python_cpp/continuous.cfg index 22f4a0e4c9..8523c22536 100644 --- a/kokoro/macos/python_cpp/continuous.cfg +++ b/kokoro/macos/python_cpp/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/python_cpp/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/python_cpp/presubmit.cfg b/kokoro/macos/python_cpp/presubmit.cfg index 22f4a0e4c9..8523c22536 100644 --- a/kokoro/macos/python_cpp/presubmit.cfg +++ b/kokoro/macos/python_cpp/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/python_cpp/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby25/common.cfg b/kokoro/macos/ruby25/common.cfg new file mode 100644 index 0000000000..b3755e4104 --- /dev/null +++ b/kokoro/macos/ruby25/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/ruby25/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/ruby25/continuous.cfg b/kokoro/macos/ruby25/continuous.cfg index b3755e4104..8523c22536 100644 --- a/kokoro/macos/ruby25/continuous.cfg +++ b/kokoro/macos/ruby25/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/ruby25/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby25/presubmit.cfg b/kokoro/macos/ruby25/presubmit.cfg index b3755e4104..8523c22536 100644 --- a/kokoro/macos/ruby25/presubmit.cfg +++ b/kokoro/macos/ruby25/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/ruby25/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby26/common.cfg b/kokoro/macos/ruby26/common.cfg new file mode 100644 index 0000000000..688f63c2bc --- /dev/null +++ b/kokoro/macos/ruby26/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/ruby26/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/ruby26/continuous.cfg b/kokoro/macos/ruby26/continuous.cfg index 688f63c2bc..8523c22536 100644 --- a/kokoro/macos/ruby26/continuous.cfg +++ b/kokoro/macos/ruby26/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/ruby26/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby26/presubmit.cfg b/kokoro/macos/ruby26/presubmit.cfg index 688f63c2bc..8523c22536 100644 --- a/kokoro/macos/ruby26/presubmit.cfg +++ b/kokoro/macos/ruby26/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/ruby26/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby27/common.cfg b/kokoro/macos/ruby27/common.cfg new file mode 100644 index 0000000000..b10b455da3 --- /dev/null +++ b/kokoro/macos/ruby27/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/ruby27/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/ruby27/continuous.cfg b/kokoro/macos/ruby27/continuous.cfg index b10b455da3..8523c22536 100644 --- a/kokoro/macos/ruby27/continuous.cfg +++ b/kokoro/macos/ruby27/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/ruby27/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby27/presubmit.cfg b/kokoro/macos/ruby27/presubmit.cfg index b10b455da3..8523c22536 100644 --- a/kokoro/macos/ruby27/presubmit.cfg +++ b/kokoro/macos/ruby27/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/ruby27/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby30/common.cfg b/kokoro/macos/ruby30/common.cfg new file mode 100644 index 0000000000..d5051170be --- /dev/null +++ b/kokoro/macos/ruby30/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/ruby30/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/ruby30/continuous.cfg b/kokoro/macos/ruby30/continuous.cfg index d5051170be..8523c22536 100644 --- a/kokoro/macos/ruby30/continuous.cfg +++ b/kokoro/macos/ruby30/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/ruby30/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby30/presubmit.cfg b/kokoro/macos/ruby30/presubmit.cfg index d5051170be..8523c22536 100644 --- a/kokoro/macos/ruby30/presubmit.cfg +++ b/kokoro/macos/ruby30/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/ruby30/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby31/common.cfg b/kokoro/macos/ruby31/common.cfg new file mode 100644 index 0000000000..19e16b3eaf --- /dev/null +++ b/kokoro/macos/ruby31/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/macos/ruby31/build.sh" +timeout_mins: 1440 diff --git a/kokoro/macos/ruby31/continuous.cfg b/kokoro/macos/ruby31/continuous.cfg index 19e16b3eaf..8523c22536 100644 --- a/kokoro/macos/ruby31/continuous.cfg +++ b/kokoro/macos/ruby31/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/ruby31/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby31/presubmit.cfg b/kokoro/macos/ruby31/presubmit.cfg index 19e16b3eaf..8523c22536 100644 --- a/kokoro/macos/ruby31/presubmit.cfg +++ b/kokoro/macos/ruby31/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/macos/ruby31/build.sh" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/release/csharp/windows/common.cfg b/kokoro/release/csharp/windows/common.cfg new file mode 100644 index 0000000000..f508c65bda --- /dev/null +++ b/kokoro/release/csharp/windows/common.cfg @@ -0,0 +1,11 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/release/csharp/windows/build_nuget.bat" +timeout_mins: 60 + +action { + define_artifacts { + regex: "**/*.nupkg" + } +} diff --git a/kokoro/release/csharp/windows/continuous.cfg b/kokoro/release/csharp/windows/continuous.cfg index f508c65bda..8523c22536 100644 --- a/kokoro/release/csharp/windows/continuous.cfg +++ b/kokoro/release/csharp/windows/continuous.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/release/csharp/windows/build_nuget.bat" -timeout_mins: 60 - -action { - define_artifacts { - regex: "**/*.nupkg" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/release/csharp/windows/presubmit.cfg b/kokoro/release/csharp/windows/presubmit.cfg index f508c65bda..8523c22536 100644 --- a/kokoro/release/csharp/windows/presubmit.cfg +++ b/kokoro/release/csharp/windows/presubmit.cfg @@ -1,11 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/release/csharp/windows/build_nuget.bat" -timeout_mins: 60 - -action { - define_artifacts { - regex: "**/*.nupkg" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/release/ruby/linux/common.cfg b/kokoro/release/ruby/linux/common.cfg new file mode 100644 index 0000000000..dbc71b2ceb --- /dev/null +++ b/kokoro/release/ruby/linux/common.cfg @@ -0,0 +1,8 @@ +# Configuration for Linux release builds +build_file: "protobuf/kokoro/release/ruby/linux/build_artifacts.sh" + +action { + define_artifacts { + regex: "github/protobuf/artifacts/**" + } +} diff --git a/kokoro/release/ruby/linux/continuous.cfg b/kokoro/release/ruby/linux/continuous.cfg index dbc71b2ceb..8523c22536 100644 --- a/kokoro/release/ruby/linux/continuous.cfg +++ b/kokoro/release/ruby/linux/continuous.cfg @@ -1,8 +1 @@ -# Configuration for Linux release builds -build_file: "protobuf/kokoro/release/ruby/linux/build_artifacts.sh" - -action { - define_artifacts { - regex: "github/protobuf/artifacts/**" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/release/ruby/linux/presubmit.cfg b/kokoro/release/ruby/linux/presubmit.cfg index dbc71b2ceb..8523c22536 100644 --- a/kokoro/release/ruby/linux/presubmit.cfg +++ b/kokoro/release/ruby/linux/presubmit.cfg @@ -1,8 +1 @@ -# Configuration for Linux release builds -build_file: "protobuf/kokoro/release/ruby/linux/build_artifacts.sh" - -action { - define_artifacts { - regex: "github/protobuf/artifacts/**" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/release/ruby/macos/common.cfg b/kokoro/release/ruby/macos/common.cfg new file mode 100644 index 0000000000..cb1c08bb88 --- /dev/null +++ b/kokoro/release/ruby/macos/common.cfg @@ -0,0 +1,8 @@ +# Configuration for Mac OSX release builds +build_file: "protobuf/kokoro/release/ruby/macos/build_artifacts.sh" + +action { + define_artifacts { + regex: "github/protobuf/artifacts/**" + } +} diff --git a/kokoro/release/ruby/macos/continuous.cfg b/kokoro/release/ruby/macos/continuous.cfg index cb1c08bb88..8523c22536 100644 --- a/kokoro/release/ruby/macos/continuous.cfg +++ b/kokoro/release/ruby/macos/continuous.cfg @@ -1,8 +1 @@ -# Configuration for Mac OSX release builds -build_file: "protobuf/kokoro/release/ruby/macos/build_artifacts.sh" - -action { - define_artifacts { - regex: "github/protobuf/artifacts/**" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/release/ruby/macos/presubmit.cfg b/kokoro/release/ruby/macos/presubmit.cfg index cb1c08bb88..8523c22536 100644 --- a/kokoro/release/ruby/macos/presubmit.cfg +++ b/kokoro/release/ruby/macos/presubmit.cfg @@ -1,8 +1 @@ -# Configuration for Mac OSX release builds -build_file: "protobuf/kokoro/release/ruby/macos/build_artifacts.sh" - -action { - define_artifacts { - regex: "github/protobuf/artifacts/**" - } -} +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/bazel/common.cfg b/kokoro/windows/bazel/common.cfg new file mode 100644 index 0000000000..5978a7aa0d --- /dev/null +++ b/kokoro/windows/bazel/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/windows/bazel/build.bat" +timeout_mins: 1440 diff --git a/kokoro/windows/bazel/continuous.cfg b/kokoro/windows/bazel/continuous.cfg index 5978a7aa0d..8523c22536 100644 --- a/kokoro/windows/bazel/continuous.cfg +++ b/kokoro/windows/bazel/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/bazel/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/bazel/presubmit.cfg b/kokoro/windows/bazel/presubmit.cfg index 5978a7aa0d..8523c22536 100644 --- a/kokoro/windows/bazel/presubmit.cfg +++ b/kokoro/windows/bazel/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/bazel/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/cmake/common.cfg b/kokoro/windows/cmake/common.cfg new file mode 100644 index 0000000000..37e89e068b --- /dev/null +++ b/kokoro/windows/cmake/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/windows/cmake/build.bat" +timeout_mins: 1440 diff --git a/kokoro/windows/cmake/continuous.cfg b/kokoro/windows/cmake/continuous.cfg index 37e89e068b..8523c22536 100644 --- a/kokoro/windows/cmake/continuous.cfg +++ b/kokoro/windows/cmake/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/cmake/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/cmake/presubmit.cfg b/kokoro/windows/cmake/presubmit.cfg index 37e89e068b..8523c22536 100644 --- a/kokoro/windows/cmake/presubmit.cfg +++ b/kokoro/windows/cmake/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/cmake/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/cmake_install/common.cfg b/kokoro/windows/cmake_install/common.cfg new file mode 100644 index 0000000000..2efc0dced2 --- /dev/null +++ b/kokoro/windows/cmake_install/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/windows/cmake_install/build.bat" +timeout_mins: 1440 diff --git a/kokoro/windows/cmake_install/continuous.cfg b/kokoro/windows/cmake_install/continuous.cfg index 2efc0dced2..8523c22536 100644 --- a/kokoro/windows/cmake_install/continuous.cfg +++ b/kokoro/windows/cmake_install/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/cmake_install/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/cmake_install/presubmit.cfg b/kokoro/windows/cmake_install/presubmit.cfg index 2efc0dced2..8523c22536 100644 --- a/kokoro/windows/cmake_install/presubmit.cfg +++ b/kokoro/windows/cmake_install/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/cmake_install/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/cmake_nmake/common.cfg b/kokoro/windows/cmake_nmake/common.cfg new file mode 100644 index 0000000000..3c279fe421 --- /dev/null +++ b/kokoro/windows/cmake_nmake/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/windows/cmake_nmake/build.bat" +timeout_mins: 1440 diff --git a/kokoro/windows/cmake_nmake/continuous.cfg b/kokoro/windows/cmake_nmake/continuous.cfg index 3c279fe421..8523c22536 100644 --- a/kokoro/windows/cmake_nmake/continuous.cfg +++ b/kokoro/windows/cmake_nmake/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/cmake_nmake/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/cmake_nmake/presubmit.cfg b/kokoro/windows/cmake_nmake/presubmit.cfg index 3c279fe421..8523c22536 100644 --- a/kokoro/windows/cmake_nmake/presubmit.cfg +++ b/kokoro/windows/cmake_nmake/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/cmake_nmake/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/cmake_shared/common.cfg b/kokoro/windows/cmake_shared/common.cfg new file mode 100644 index 0000000000..0ba52e2a98 --- /dev/null +++ b/kokoro/windows/cmake_shared/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/windows/cmake_shared/build.bat" +timeout_mins: 1440 diff --git a/kokoro/windows/cmake_shared/continuous.cfg b/kokoro/windows/cmake_shared/continuous.cfg index 0ba52e2a98..8523c22536 100644 --- a/kokoro/windows/cmake_shared/continuous.cfg +++ b/kokoro/windows/cmake_shared/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/cmake_shared/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/cmake_shared/presubmit.cfg b/kokoro/windows/cmake_shared/presubmit.cfg index 0ba52e2a98..8523c22536 100644 --- a/kokoro/windows/cmake_shared/presubmit.cfg +++ b/kokoro/windows/cmake_shared/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/cmake_shared/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/csharp/common.cfg b/kokoro/windows/csharp/common.cfg new file mode 100644 index 0000000000..f586585176 --- /dev/null +++ b/kokoro/windows/csharp/common.cfg @@ -0,0 +1,5 @@ +# Config file for running tests in Kokoro + +# Location of the build script in repository +build_file: "protobuf/kokoro/windows/csharp/build.bat" +timeout_mins: 1440 diff --git a/kokoro/windows/csharp/continuous.cfg b/kokoro/windows/csharp/continuous.cfg index f586585176..8523c22536 100644 --- a/kokoro/windows/csharp/continuous.cfg +++ b/kokoro/windows/csharp/continuous.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/csharp/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/windows/csharp/presubmit.cfg b/kokoro/windows/csharp/presubmit.cfg index f586585176..8523c22536 100644 --- a/kokoro/windows/csharp/presubmit.cfg +++ b/kokoro/windows/csharp/presubmit.cfg @@ -1,5 +1 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/windows/csharp/build.bat" -timeout_mins: 1440 +# Keep this file empty! Use common.cfg instead. diff --git a/protobuf_deps.bzl b/protobuf_deps.bzl index e276c88884..427f29fb60 100644 --- a/protobuf_deps.bzl +++ b/protobuf_deps.bzl @@ -115,6 +115,6 @@ def protobuf_deps(): _github_archive( name = "upb", repo = "https://github.com/protocolbuffers/upb", - commit = "470f06cccbf26f98dd2df7ddecf24a78f140fe11", - sha256 = "c3137f3da811142d33d2ad278d093152610d3a773b17839d272bca4b1a6e304b", + commit = "5485645125ba3783ae2b597bd7b77679721cb1c6", + sha256 = "86de85c58eb3cb04b0987a7642ce84e55629f704ab4a9a0210a660a1115f1dd0", ) diff --git a/python/google/protobuf/pyext/descriptor_containers.cc b/python/google/protobuf/pyext/descriptor_containers.cc index 8c038e9dc9..f38fdc74e5 100644 --- a/python/google/protobuf/pyext/descriptor_containers.cc +++ b/python/google/protobuf/pyext/descriptor_containers.cc @@ -54,6 +54,8 @@ // This inclusion must appear before all the others. #include +#include + #include "google/protobuf/pyext/descriptor_containers.h" // clang-format on diff --git a/python/google/protobuf/pyext/descriptor_database.cc b/python/google/protobuf/pyext/descriptor_database.cc index 7ef94b3860..e547306d51 100644 --- a/python/google/protobuf/pyext/descriptor_database.cc +++ b/python/google/protobuf/pyext/descriptor_database.cc @@ -34,6 +34,8 @@ #include "google/protobuf/pyext/descriptor_database.h" #include +#include +#include #include "google/protobuf/stubs/logging.h" #include "google/protobuf/stubs/common.h" diff --git a/python/google/protobuf/pyext/descriptor_database.h b/python/google/protobuf/pyext/descriptor_database.h index 598466e981..108a8583b3 100644 --- a/python/google/protobuf/pyext/descriptor_database.h +++ b/python/google/protobuf/pyext/descriptor_database.h @@ -34,6 +34,9 @@ #define PY_SSIZE_T_CLEAN #include +#include +#include + #include "google/protobuf/descriptor_database.h" namespace google { diff --git a/python/google/protobuf/pyext/descriptor_pool.cc b/python/google/protobuf/pyext/descriptor_pool.cc index 0f25ed3539..db14ae6624 100644 --- a/python/google/protobuf/pyext/descriptor_pool.cc +++ b/python/google/protobuf/pyext/descriptor_pool.cc @@ -30,7 +30,10 @@ // Implements the DescriptorPool, which collects all descriptors. +#include #include +#include +#include #define PY_SSIZE_T_CLEAN #include diff --git a/python/google/protobuf/pyext/extension_dict.cc b/python/google/protobuf/pyext/extension_dict.cc index d03ad87d23..806af4f865 100644 --- a/python/google/protobuf/pyext/extension_dict.cc +++ b/python/google/protobuf/pyext/extension_dict.cc @@ -35,6 +35,7 @@ #include #include +#include #include "google/protobuf/stubs/logging.h" #include "google/protobuf/stubs/common.h" diff --git a/python/google/protobuf/pyext/map_container.cc b/python/google/protobuf/pyext/map_container.cc index e7ff1c8b63..5d287d3da2 100644 --- a/python/google/protobuf/pyext/map_container.cc +++ b/python/google/protobuf/pyext/map_container.cc @@ -34,6 +34,7 @@ #include #include +#include #include "google/protobuf/stubs/logging.h" #include "google/protobuf/stubs/common.h" diff --git a/python/google/protobuf/pyext/message.cc b/python/google/protobuf/pyext/message.cc index a56264ea81..ca36458531 100644 --- a/python/google/protobuf/pyext/message.cc +++ b/python/google/protobuf/pyext/message.cc @@ -38,6 +38,7 @@ #include #include #include +#include #include #include diff --git a/python/google/protobuf/pyext/message_factory.cc b/python/google/protobuf/pyext/message_factory.cc index bcbd7d8d7b..27aa5e4417 100644 --- a/python/google/protobuf/pyext/message_factory.cc +++ b/python/google/protobuf/pyext/message_factory.cc @@ -29,6 +29,7 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include +#include #define PY_SSIZE_T_CLEAN #include diff --git a/python/google/protobuf/pyext/repeated_scalar_container.cc b/python/google/protobuf/pyext/repeated_scalar_container.cc index 1a39468e96..57746dcf77 100644 --- a/python/google/protobuf/pyext/repeated_scalar_container.cc +++ b/python/google/protobuf/pyext/repeated_scalar_container.cc @@ -35,6 +35,7 @@ #include #include +#include #include "google/protobuf/stubs/common.h" #include "google/protobuf/stubs/logging.h" diff --git a/src/google/protobuf/compiler/cpp/helpers.h b/src/google/protobuf/compiler/cpp/helpers.h index 55fe178cdc..19120e313c 100644 --- a/src/google/protobuf/compiler/cpp/helpers.h +++ b/src/google/protobuf/compiler/cpp/helpers.h @@ -220,7 +220,7 @@ inline const Descriptor* FieldScope(const FieldDescriptor* field) { std::string FieldMessageTypeName(const FieldDescriptor* field, const Options& options); -// Get the C++ type name for a primitive type (e.g. "double", "::google::protobuf::int32", etc.). +// Get the C++ type name for a primitive type (e.g. "double", "::int32", etc.). const char* PrimitiveTypeName(FieldDescriptor::CppType type); std::string PrimitiveTypeName(const Options& options, FieldDescriptor::CppType type); diff --git a/src/google/protobuf/io/printer.cc b/src/google/protobuf/io/printer.cc index f357b766be..b2e16372e7 100644 --- a/src/google/protobuf/io/printer.cc +++ b/src/google/protobuf/io/printer.cc @@ -169,7 +169,13 @@ void Printer::Emit( absl::flat_hash_map>> - map = vars; + map; + map.reserve(vars.size()); + for (auto& var : vars) { + auto result = map.insert(var); + GOOGLE_CHECK(result.second) << "repeated variable in Emit() call: \"" << var.first + << "\""; + } var_lookups_.emplace_back([&map](absl::string_view var) -> LookupResult { auto it = map.find(var); diff --git a/src/google/protobuf/port_def.inc b/src/google/protobuf/port_def.inc index bbfc299d19..ac4b2b9ed3 100644 --- a/src/google/protobuf/port_def.inc +++ b/src/google/protobuf/port_def.inc @@ -875,6 +875,13 @@ #undef PACKAGE #endif +// linux is a legacy MACRO defined in most popular C++ standards. +#ifdef linux +#pragma push_macro("linux") +#undef linux +#define PROTOBUF_DID_UNDEF_LINUX +#endif + // Windows declares several inconvenient macro names. We #undef them and then // restore them in port_undef.inc. #ifdef _WIN32 diff --git a/src/google/protobuf/port_undef.inc b/src/google/protobuf/port_undef.inc index 4dd6586811..e991502faa 100644 --- a/src/google/protobuf/port_undef.inc +++ b/src/google/protobuf/port_undef.inc @@ -121,12 +121,17 @@ #undef PROTOBUF_FUTURE_FINAL +// Restore macros that may have been #undef'd in port_def.inc. + #ifdef PROTOBUF_DID_UNDEF_PACKAGE #pragma pop_macro("PACKAGE") #undef PROTOBUF_DID_UNDEF_PACKAGE #endif -// Restore macro that may have been #undef'd in port_def.inc. +#ifdef PROTOBUF_DID_UNDEF_LINUX +#pragma pop_macro("linux") +#endif + #ifdef _WIN32 #pragma pop_macro("CREATE_NEW") #pragma pop_macro("DELETE") diff --git a/src/google/protobuf/text_format.cc b/src/google/protobuf/text_format.cc index 8633e88699..cf2afa2ffb 100644 --- a/src/google/protobuf/text_format.cc +++ b/src/google/protobuf/text_format.cc @@ -53,6 +53,7 @@ #include "google/protobuf/stubs/strutil.h" #include "absl/strings/ascii.h" #include "absl/strings/escaping.h" +#include "absl/strings/numbers.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_join.h" #include "absl/strings/string_view.h"