diff --git a/kokoro/macos/objectivec_ios_debug/build.sh b/kokoro/macos/objectivec_ios_debug/build.sh deleted file mode 100755 index 77b704f196..0000000000 --- a/kokoro/macos/objectivec_ios_debug/build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests - -# Change to repo root -cd $(dirname $0)/../../.. - -# Prepare worker environment to run tests -source kokoro/macos/prepare_build_macos_rc - -objectivec/DevTools/full_mac_build.sh \ - --core-only --skip-xcode-osx --skip-xcode-tvos --skip-objc-conformance --skip-xcode-release diff --git a/kokoro/macos/objectivec_ios_debug/common.cfg b/kokoro/macos/objectivec_ios_debug/common.cfg deleted file mode 100644 index b4ccc45831..0000000000 --- a/kokoro/macos/objectivec_ios_debug/common.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 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 - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } - } -} -bazel_setting { - project_id: "protobuf-build" - bes_backend_address: "buildeventservice.googleapis.com" - foundry_backend_address: "remotebuildexecution.googleapis.com" - upsalite_frontend_address: "https://source.cloud.google.com" - local_execution: true - - # Need to be same as the fetch_keystore entry in the previous step. - auth_credential: { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } -} diff --git a/kokoro/macos/objectivec_ios_debug/continuous.cfg b/kokoro/macos/objectivec_ios_debug/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/objectivec_ios_debug/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# 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 deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/objectivec_ios_debug/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/objectivec_ios_release/build.sh b/kokoro/macos/objectivec_ios_release/build.sh deleted file mode 100755 index adbc4f2f55..0000000000 --- a/kokoro/macos/objectivec_ios_release/build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests - -# Change to repo root -cd $(dirname $0)/../../.. - -# Prepare worker environment to run tests -source kokoro/macos/prepare_build_macos_rc - -objectivec/DevTools/full_mac_build.sh \ - --core-only --skip-xcode-osx --skip-xcode-tvos --skip-objc-conformance --skip-xcode-debug diff --git a/kokoro/macos/objectivec_ios_release/common.cfg b/kokoro/macos/objectivec_ios_release/common.cfg deleted file mode 100644 index 3a6ac86716..0000000000 --- a/kokoro/macos/objectivec_ios_release/common.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 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 - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } - } -} -bazel_setting { - project_id: "protobuf-build" - bes_backend_address: "buildeventservice.googleapis.com" - foundry_backend_address: "remotebuildexecution.googleapis.com" - upsalite_frontend_address: "https://source.cloud.google.com" - local_execution: true - - # Need to be same as the fetch_keystore entry in the previous step. - auth_credential: { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } -} diff --git a/kokoro/macos/objectivec_ios_release/continuous.cfg b/kokoro/macos/objectivec_ios_release/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/objectivec_ios_release/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# 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 deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/objectivec_ios_release/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/objectivec_osx/build.sh b/kokoro/macos/objectivec_osx/build.sh deleted file mode 100755 index 7f5d561c23..0000000000 --- a/kokoro/macos/objectivec_osx/build.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests - -# Change to repo root -cd $(dirname $0)/../../.. - -# Prepare worker environment to run tests -source kokoro/macos/prepare_build_macos_rc - -objectivec/DevTools/full_mac_build.sh \ - --core-only --skip-xcode-ios --skip-xcode-tvos diff --git a/kokoro/macos/objectivec_osx/common.cfg b/kokoro/macos/objectivec_osx/common.cfg deleted file mode 100644 index ee5c2db34f..0000000000 --- a/kokoro/macos/objectivec_osx/common.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 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 - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } - } -} -bazel_setting { - project_id: "protobuf-build" - bes_backend_address: "buildeventservice.googleapis.com" - foundry_backend_address: "remotebuildexecution.googleapis.com" - upsalite_frontend_address: "https://source.cloud.google.com" - local_execution: true - - # Need to be same as the fetch_keystore entry in the previous step. - auth_credential: { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } -} diff --git a/kokoro/macos/objectivec_osx/continuous.cfg b/kokoro/macos/objectivec_osx/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/objectivec_osx/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/objectivec_osx/presubmit.cfg b/kokoro/macos/objectivec_osx/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/objectivec_osx/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/php74/build.sh b/kokoro/macos/php74/build.sh deleted file mode 100755 index f0444347ef..0000000000 --- a/kokoro/macos/php74/build.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests - -# Change to repo root -cd $(dirname $0)/../../.. - -# Prepare worker environment to run tests -source kokoro/macos/prepare_build_macos_rc - -# Install Dependencies -# PHP 7.4 is already installed on the machine -brew cleanup -brew install coreutils - -# Configure path -PHP_FOLDER=$(find $HOMEBREW_PREFIX -type d -regex ".*php.*/7.4.[0-9_.]*" | sort -n | tail -n 1) -test ! -z "$PHP_FOLDER" -export PATH="$PHP_FOLDER/bin:$PATH" - -# Test -kokoro/macos/test_php.sh diff --git a/kokoro/macos/php74/common.cfg b/kokoro/macos/php74/common.cfg deleted file mode 100644 index b9d5b822d6..0000000000 --- a/kokoro/macos/php74/common.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 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 - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } - } -} -bazel_setting { - project_id: "protobuf-build" - bes_backend_address: "buildeventservice.googleapis.com" - foundry_backend_address: "remotebuildexecution.googleapis.com" - upsalite_frontend_address: "https://source.cloud.google.com" - local_execution: true - - # Need to be same as the fetch_keystore entry in the previous step. - auth_credential: { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } -} diff --git a/kokoro/macos/php74/continuous.cfg b/kokoro/macos/php74/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/php74/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/php74/presubmit.cfg b/kokoro/macos/php74/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/php74/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/php80/build.sh b/kokoro/macos/php80/build.sh deleted file mode 100755 index e703ffc18f..0000000000 --- a/kokoro/macos/php80/build.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests - -# Change to repo root -cd $(dirname $0)/../../.. - -# Prepare worker environment to run tests -source kokoro/macos/prepare_build_macos_rc - -# Install Dependencies -brew cleanup -brew install coreutils php@8.0 - -# Configure path -PHP_FOLDER=$(find $HOMEBREW_PREFIX -type d -regex ".*php.*/8.0.[0-9_.]*" | sort -n | tail -n 1) -test ! -z "$PHP_FOLDER" -export PATH="$PHP_FOLDER/bin:$PATH" - -# Test -kokoro/macos/test_php.sh diff --git a/kokoro/macos/php80/common.cfg b/kokoro/macos/php80/common.cfg deleted file mode 100644 index 294fd52a00..0000000000 --- a/kokoro/macos/php80/common.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 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 - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } - } -} -bazel_setting { - project_id: "protobuf-build" - bes_backend_address: "buildeventservice.googleapis.com" - foundry_backend_address: "remotebuildexecution.googleapis.com" - upsalite_frontend_address: "https://source.cloud.google.com" - local_execution: true - - # Need to be same as the fetch_keystore entry in the previous step. - auth_credential: { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } -} diff --git a/kokoro/macos/php80/continuous.cfg b/kokoro/macos/php80/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/php80/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/php80/presubmit.cfg b/kokoro/macos/php80/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/php80/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc deleted file mode 100755 index 7156d58b32..0000000000 --- a/kokoro/macos/prepare_build_macos_rc +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# -# This script sets up a Kokoro MacOS worker for running Protobuf tests - -set -eux - -export HOMEBREW_PREFIX=$(brew --prefix) -export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 # Do not automatically update packages. - -## -# Select Xcode version -export DEVELOPER_DIR=/Applications/Xcode_14.app/Contents/Developer -sudo xcode-select -s "${DEVELOPER_DIR}" - -## -# Use Python 2 by default (for googletest) -pyenv global 2.7.18 - -## -# Setup RVM -if [[ "${KOKORO_INSTALL_RVM:-}" == "yes" ]] ; then - git config --global --add safe.directory $HOMEBREW_PREFIX/Library/Taps/homebrew/homebrew-cask - git config --global --add safe.directory $HOMEBREW_PREFIX/Library/Taps/homebrew/homebrew-core - git config --global --add safe.directory $HOMEBREW_PREFIX/Library/Taps/homebrew/homebrew-services - sudo chown -R $(whoami) $HOME/.rvm/ -fi - -# "Install" valgrind if it doesn't exist -## -if [ ! -x "$(command -v valgrind)" ]; then - echo "#! /bin/bash" > valgrind - chmod ug+x valgrind - sudo mv valgrind /usr/local/bin/valgrind -fi - -## -# Install Virtual Python Environment - -if [[ "${KOKORO_INSTALL_VENV:-}" == "yes" ]] ; then - python3 -m venv venv - source venv/bin/activate -fi diff --git a/kokoro/macos/python/build.sh b/kokoro/macos/python/build.sh deleted file mode 100755 index a3edceafca..0000000000 --- a/kokoro/macos/python/build.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests - -# Change to repo root -cd $(dirname $0)/../../.. - -# Prepare worker environment to run tests -KOKORO_INSTALL_VENV=yes -source kokoro/macos/prepare_build_macos_rc - -bazel test //python/... @upb//python/... //python:python_version \ - $(kokoro/common/bazel_flags.sh) \ - --macos_minimum_os=10.9 diff --git a/kokoro/macos/python/common.cfg b/kokoro/macos/python/common.cfg deleted file mode 100644 index dd9f8ac00a..0000000000 --- a/kokoro/macos/python/common.cfg +++ /dev/null @@ -1,33 +0,0 @@ -# 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: "**/*" - } -} - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } - } -} -bazel_setting { - project_id: "protobuf-build" - bes_backend_address: "buildeventservice.googleapis.com" - foundry_backend_address: "remotebuildexecution.googleapis.com" - upsalite_frontend_address: "https://source.cloud.google.com" - local_execution: true - - # Need to be same as the fetch_keystore entry in the previous step. - auth_credential: { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } -} diff --git a/kokoro/macos/python/continuous.cfg b/kokoro/macos/python/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/python/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/python/presubmit.cfg b/kokoro/macos/python/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/python/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/python_cpp/build.sh b/kokoro/macos/python_cpp/build.sh deleted file mode 100755 index 9e83c3f0fa..0000000000 --- a/kokoro/macos/python_cpp/build.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests - -# Change to repo root -cd $(dirname $0)/../../.. - -# Prepare worker environment to run tests -KOKORO_INSTALL_VENV=yes -source kokoro/macos/prepare_build_macos_rc - -bazel test //python/... //python:python_version \ - $(kokoro/common/bazel_flags.sh) \ - --macos_minimum_os=10.9 \ - --define=use_fast_cpp_protos=true diff --git a/kokoro/macos/python_cpp/common.cfg b/kokoro/macos/python_cpp/common.cfg deleted file mode 100644 index 12270c531f..0000000000 --- a/kokoro/macos/python_cpp/common.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 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 - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } - } -} -bazel_setting { - project_id: "protobuf-build" - bes_backend_address: "buildeventservice.googleapis.com" - foundry_backend_address: "remotebuildexecution.googleapis.com" - upsalite_frontend_address: "https://source.cloud.google.com" - local_execution: true - - # Need to be same as the fetch_keystore entry in the previous step. - auth_credential: { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } -} diff --git a/kokoro/macos/python_cpp/continuous.cfg b/kokoro/macos/python_cpp/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/python_cpp/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/python_cpp/presubmit.cfg b/kokoro/macos/python_cpp/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/python_cpp/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby26/build.sh b/kokoro/macos/ruby26/build.sh deleted file mode 100755 index a7a9e2d58e..0000000000 --- a/kokoro/macos/ruby26/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests - -# Change to repo root -cd $(dirname $0)/../../.. - -bash -l kokoro/macos/test_ruby.sh ruby-2.6.0 diff --git a/kokoro/macos/ruby26/common.cfg b/kokoro/macos/ruby26/common.cfg deleted file mode 100644 index deeaf51932..0000000000 --- a/kokoro/macos/ruby26/common.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 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 - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } - } -} -bazel_setting { - project_id: "protobuf-build" - bes_backend_address: "buildeventservice.googleapis.com" - foundry_backend_address: "remotebuildexecution.googleapis.com" - upsalite_frontend_address: "https://source.cloud.google.com" - local_execution: true - - # Need to be same as the fetch_keystore entry in the previous step. - auth_credential: { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } -} diff --git a/kokoro/macos/ruby26/continuous.cfg b/kokoro/macos/ruby26/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/ruby26/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby26/presubmit.cfg b/kokoro/macos/ruby26/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/ruby26/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby27/build.sh b/kokoro/macos/ruby27/build.sh deleted file mode 100755 index aa51776ac5..0000000000 --- a/kokoro/macos/ruby27/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests - -# Change to repo root -cd $(dirname $0)/../../.. - -bash -l kokoro/macos/test_ruby.sh ruby-2.7.0 diff --git a/kokoro/macos/ruby27/common.cfg b/kokoro/macos/ruby27/common.cfg deleted file mode 100644 index 1451eb04ed..0000000000 --- a/kokoro/macos/ruby27/common.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 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 - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } - } -} -bazel_setting { - project_id: "protobuf-build" - bes_backend_address: "buildeventservice.googleapis.com" - foundry_backend_address: "remotebuildexecution.googleapis.com" - upsalite_frontend_address: "https://source.cloud.google.com" - local_execution: true - - # Need to be same as the fetch_keystore entry in the previous step. - auth_credential: { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } -} diff --git a/kokoro/macos/ruby27/continuous.cfg b/kokoro/macos/ruby27/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/ruby27/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby27/presubmit.cfg b/kokoro/macos/ruby27/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/ruby27/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby30/build.sh b/kokoro/macos/ruby30/build.sh deleted file mode 100755 index 1ccccb5145..0000000000 --- a/kokoro/macos/ruby30/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests - -# Change to repo root -cd $(dirname $0)/../../.. - -bash -l kokoro/macos/test_ruby.sh ruby-3.0.2 diff --git a/kokoro/macos/ruby30/common.cfg b/kokoro/macos/ruby30/common.cfg deleted file mode 100644 index 79dc7a531a..0000000000 --- a/kokoro/macos/ruby30/common.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 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 - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } - } -} -bazel_setting { - project_id: "protobuf-build" - bes_backend_address: "buildeventservice.googleapis.com" - foundry_backend_address: "remotebuildexecution.googleapis.com" - upsalite_frontend_address: "https://source.cloud.google.com" - local_execution: true - - # Need to be same as the fetch_keystore entry in the previous step. - auth_credential: { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } -} diff --git a/kokoro/macos/ruby30/continuous.cfg b/kokoro/macos/ruby30/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/ruby30/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby30/presubmit.cfg b/kokoro/macos/ruby30/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/ruby30/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby31/build.sh b/kokoro/macos/ruby31/build.sh deleted file mode 100644 index 9f8bbd2b73..0000000000 --- a/kokoro/macos/ruby31/build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -# Build file to set up and run tests - -# Change to repo root -cd $(dirname $0)/../../.. - -# Fix locale issues in Monterey. -export LC_ALL=en_US.UTF-8 - -bash -l kokoro/macos/test_ruby.sh ruby-3.1.0 diff --git a/kokoro/macos/ruby31/common.cfg b/kokoro/macos/ruby31/common.cfg deleted file mode 100644 index e2d1d1b83e..0000000000 --- a/kokoro/macos/ruby31/common.cfg +++ /dev/null @@ -1,27 +0,0 @@ -# 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 - -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } - } -} -bazel_setting { - project_id: "protobuf-build" - bes_backend_address: "buildeventservice.googleapis.com" - foundry_backend_address: "remotebuildexecution.googleapis.com" - upsalite_frontend_address: "https://source.cloud.google.com" - local_execution: true - - # Need to be same as the fetch_keystore entry in the previous step. - auth_credential: { - keystore_config_id: 77103 - keyname: "kokoro_gcp_service" - } -} diff --git a/kokoro/macos/ruby31/continuous.cfg b/kokoro/macos/ruby31/continuous.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/ruby31/continuous.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/ruby31/presubmit.cfg b/kokoro/macos/ruby31/presubmit.cfg deleted file mode 100644 index 8523c22536..0000000000 --- a/kokoro/macos/ruby31/presubmit.cfg +++ /dev/null @@ -1 +0,0 @@ -# Keep this file empty! Use common.cfg instead. diff --git a/kokoro/macos/test_php.sh b/kokoro/macos/test_php.sh deleted file mode 100755 index 74d88f6a36..0000000000 --- a/kokoro/macos/test_php.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -eux - -pushd php -rm -rf vendor -php -v -php -m -composer update -composer test_c -popd - -git clean -fXd -bazel test $(kokoro/common/bazel_flags.sh) \ - --action_env=PATH --test_env=PATH \ - //php:conformance_test_c diff --git a/kokoro/macos/test_ruby.sh b/kokoro/macos/test_ruby.sh deleted file mode 100755 index d6b9f4aeb1..0000000000 --- a/kokoro/macos/test_ruby.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -set -eux - -VERSION=$1 - -# Prepare worker environment to run tests -KOKORO_INSTALL_RVM=yes -source kokoro/macos/prepare_build_macos_rc - -# wget is required for ruby compatibility tests. -brew install wget - -# Configure system ruby. -# We need to disable unbound variable errors, due to a known issue described in -# https://github.com/rvm/rvm/issues/4618. -set +u -rvm install $VERSION -rvm use $VERSION -rvm current | grep -qe "${RUBY_VERSION}.*" || exit 1; -set -u - -# Run tests -bazel test //ruby/... --test_env=KOKORO_RUBY_VERSION=$VERSION