Remove ruby from 3.20.x since the tests are flaky and the release is no longer supported
diff --git a/kokoro/linux/64-bit/Dockerfile b/kokoro/linux/64-bit/Dockerfile index 189d0cf..965a097 100644 --- a/kokoro/linux/64-bit/Dockerfile +++ b/kokoro/linux/64-bit/Dockerfile
@@ -71,8 +71,6 @@ python2.6-dev \ python3.3-dev \ python3.4-dev \ - # -- For Ruby -- - ruby \ # -- For C++ benchmarks -- cmake \ # -- For PHP -- @@ -102,21 +100,6 @@ RUN pip install virtualenv tox yattag ################## -# Ruby dependencies - -# Install rvm -RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 -RUN \curl -sSL https://get.rvm.io | bash -s stable - -# Install Ruby 2.1, Ruby 2.2 and JRuby 1.7 -RUN /bin/bash -l -c "rvm install ruby-2.1" -RUN /bin/bash -l -c "rvm install ruby-2.2" -RUN /bin/bash -l -c "rvm install jruby-1.7" -RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc" -RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc" -RUN /bin/bash -l -c "gem install bundler --no-ri --no-rdoc" - -################## # Java dependencies # This step requires compiling protoc. :(
diff --git a/kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh b/kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh deleted file mode 100755 index dc093bc..0000000 --- a/kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh +++ /dev/null
@@ -1,17 +0,0 @@ -#!/bin/bash - -set -ex - -# go to the repo root -cd $(dirname $0)/../../.. - -gem install bundler - -cd ruby - -bundle -rake -rake clobber_package gem - -# run all the tests -rake test
diff --git a/kokoro/linux/aarch64/test_ruby_aarch64.sh b/kokoro/linux/aarch64/test_ruby_aarch64.sh deleted file mode 100755 index 91ee5f2..0000000 --- a/kokoro/linux/aarch64/test_ruby_aarch64.sh +++ /dev/null
@@ -1,27 +0,0 @@ -#!/bin/bash - -set -ex - -# go to the repo root -cd $(dirname $0)/../../.. - -if [[ -t 0 ]]; then - DOCKER_TTY_ARGS="-it" -else - # The input device on kokoro is not a TTY, so -it does not work. - DOCKER_TTY_ARGS= -fi - -# crosscompile protoc as we will later need it for the ruby build. -# we build it under the dockcross/manylinux2014-aarch64 image so that the resulting protoc binary is compatible -# with a wide range of linux distros (including any docker images we will use later to build and test ruby) -kokoro/linux/aarch64/dockcross_helpers/run_dockcross_manylinux2014_aarch64.sh kokoro/linux/aarch64/protoc_crosscompile_aarch64.sh - -# use an actual aarch64 docker image (with a real aarch64 ruby) to run build & test protobuf ruby under an emulator -# * mount the protobuf root as /work to be able to access the crosscompiled files -# * to avoid running the process inside docker as root (which can pollute the workspace with files owned by root), we force -# running under current user's UID and GID. To be able to do that, we need to provide a home directory for the user -# otherwise the UID would be homeless under the docker container and pip install wouldn't work. For simplicity, -# we just run map the user's home to a throwaway temporary directory - -docker run $DOCKER_TTY_ARGS --rm --user "$(id -u):$(id -g)" -e "HOME=/home/fake-user" -v "$(mktemp -d):/home/fake-user" -v "$(pwd)":/work -w /work arm64v8/ruby:2.7.3-buster kokoro/linux/aarch64/ruby_build_and_run_tests_with_qemu_aarch64.sh \ No newline at end of file
diff --git a/kokoro/linux/dockerfile/test/ruby/Dockerfile b/kokoro/linux/dockerfile/test/ruby/Dockerfile index 8362870..2ac91c2 100644 --- a/kokoro/linux/dockerfile/test/ruby/Dockerfile +++ b/kokoro/linux/dockerfile/test/ruby/Dockerfile
@@ -35,8 +35,6 @@ RUN /bin/bash -l -c "rvm install 2.6.0" RUN /bin/bash -l -c "rvm install 2.7.0" RUN /bin/bash -l -c "rvm install 3.0.0" -RUN /bin/bash -l -c "rvm install jruby-9.2.19.0" -RUN /bin/bash -l -c "rvm install jruby-9.3.0.0" RUN /bin/bash -l -c "echo 'gem: --no-ri --no-rdoc' > ~/.gemrc" RUN /bin/bash -l -c "echo 'export PATH=/usr/local/rvm/bin:$PATH' >> ~/.bashrc"
diff --git a/kokoro/linux/jruby92/build.sh b/kokoro/linux/jruby92/build.sh deleted file mode 100755 index 5820115..0000000 --- a/kokoro/linux/jruby92/build.sh +++ /dev/null
@@ -1,18 +0,0 @@ -#!/bin/bash -# -# This is the top-level script we give to Kokoro as the entry point for -# running the "pull request" project: -# -# This script selects a specific Dockerfile (for building a Docker image) and -# a script to run inside that image. Then we delegate to the general -# build_and_run_docker.sh script. - -# Change to repo root -cd $(dirname $0)/../../.. - -export DOCKERHUB_ORGANIZATION=protobuftesting -export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby -export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh -export OUTPUT_DIR=testoutput -export TEST_SET="jruby92" -./kokoro/linux/build_and_run_docker.sh
diff --git a/kokoro/linux/jruby92/continuous.cfg b/kokoro/linux/jruby92/continuous.cfg deleted file mode 100644 index 3339584..0000000 --- a/kokoro/linux/jruby92/continuous.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/jruby92/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/jruby92/presubmit.cfg b/kokoro/linux/jruby92/presubmit.cfg deleted file mode 100644 index 3339584..0000000 --- a/kokoro/linux/jruby92/presubmit.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/jruby92/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/jruby93/build.sh b/kokoro/linux/jruby93/build.sh deleted file mode 100755 index 24c54d0..0000000 --- a/kokoro/linux/jruby93/build.sh +++ /dev/null
@@ -1,18 +0,0 @@ -#!/bin/bash -# -# This is the top-level script we give to Kokoro as the entry point for -# running the "pull request" project: -# -# This script selects a specific Dockerfile (for building a Docker image) and -# a script to run inside that image. Then we delegate to the general -# build_and_run_docker.sh script. - -# Change to repo root -cd $(dirname $0)/../../.. - -export DOCKERHUB_ORGANIZATION=protobuftesting -export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby -export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh -export OUTPUT_DIR=testoutput -export TEST_SET="jruby93" -./kokoro/linux/build_and_run_docker.sh
diff --git a/kokoro/linux/jruby93/continuous.cfg b/kokoro/linux/jruby93/continuous.cfg deleted file mode 100644 index 706d848..0000000 --- a/kokoro/linux/jruby93/continuous.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/jruby93/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/jruby93/presubmit.cfg b/kokoro/linux/jruby93/presubmit.cfg deleted file mode 100644 index 706d848..0000000 --- a/kokoro/linux/jruby93/presubmit.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/jruby93/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/ruby25/build.sh b/kokoro/linux/ruby25/build.sh deleted file mode 100755 index 1e82ec5..0000000 --- a/kokoro/linux/ruby25/build.sh +++ /dev/null
@@ -1,18 +0,0 @@ -#!/bin/bash -# -# This is the top-level script we give to Kokoro as the entry point for -# running the "pull request" project: -# -# This script selects a specific Dockerfile (for building a Docker image) and -# a script to run inside that image. Then we delegate to the general -# build_and_run_docker.sh script. - -# Change to repo root -cd $(dirname $0)/../../.. - -export DOCKERHUB_ORGANIZATION=protobuftesting -export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby -export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh -export OUTPUT_DIR=testoutput -export TEST_SET="ruby25" -./kokoro/linux/build_and_run_docker.sh
diff --git a/kokoro/linux/ruby25/continuous.cfg b/kokoro/linux/ruby25/continuous.cfg deleted file mode 100644 index dee2db0..0000000 --- a/kokoro/linux/ruby25/continuous.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/ruby25/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/ruby25/presubmit.cfg b/kokoro/linux/ruby25/presubmit.cfg deleted file mode 100644 index dee2db0..0000000 --- a/kokoro/linux/ruby25/presubmit.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/ruby25/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/ruby26/build.sh b/kokoro/linux/ruby26/build.sh deleted file mode 100755 index 72d2d45..0000000 --- a/kokoro/linux/ruby26/build.sh +++ /dev/null
@@ -1,18 +0,0 @@ -#!/bin/bash -# -# This is the top-level script we give to Kokoro as the entry point for -# running the "pull request" project: -# -# This script selects a specific Dockerfile (for building a Docker image) and -# a script to run inside that image. Then we delegate to the general -# build_and_run_docker.sh script. - -# Change to repo root -cd $(dirname $0)/../../.. - -export DOCKERHUB_ORGANIZATION=protobuftesting -export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby -export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh -export OUTPUT_DIR=testoutput -export TEST_SET="ruby26" -./kokoro/linux/build_and_run_docker.sh
diff --git a/kokoro/linux/ruby26/continuous.cfg b/kokoro/linux/ruby26/continuous.cfg deleted file mode 100644 index 4779065..0000000 --- a/kokoro/linux/ruby26/continuous.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/ruby26/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/ruby26/presubmit.cfg b/kokoro/linux/ruby26/presubmit.cfg deleted file mode 100644 index 4779065..0000000 --- a/kokoro/linux/ruby26/presubmit.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/ruby26/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/ruby27/build.sh b/kokoro/linux/ruby27/build.sh deleted file mode 100755 index c38ee36..0000000 --- a/kokoro/linux/ruby27/build.sh +++ /dev/null
@@ -1,18 +0,0 @@ -#!/bin/bash -# -# This is the top-level script we give to Kokoro as the entry point for -# running the "pull request" project: -# -# This script selects a specific Dockerfile (for building a Docker image) and -# a script to run inside that image. Then we delegate to the general -# build_and_run_docker.sh script. - -# Change to repo root -cd $(dirname $0)/../../.. - -export DOCKERHUB_ORGANIZATION=protobuftesting -export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby -export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh -export OUTPUT_DIR=testoutput -export TEST_SET="ruby27" -./kokoro/linux/build_and_run_docker.sh
diff --git a/kokoro/linux/ruby27/continuous.cfg b/kokoro/linux/ruby27/continuous.cfg deleted file mode 100644 index 9cce8c9..0000000 --- a/kokoro/linux/ruby27/continuous.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/ruby27/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/ruby27/presubmit.cfg b/kokoro/linux/ruby27/presubmit.cfg deleted file mode 100644 index 9cce8c9..0000000 --- a/kokoro/linux/ruby27/presubmit.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/ruby27/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/ruby30/build.sh b/kokoro/linux/ruby30/build.sh deleted file mode 100755 index 9e44575..0000000 --- a/kokoro/linux/ruby30/build.sh +++ /dev/null
@@ -1,18 +0,0 @@ -#!/bin/bash -# -# This is the top-level script we give to Kokoro as the entry point for -# running the "pull request" project: -# -# This script selects a specific Dockerfile (for building a Docker image) and -# a script to run inside that image. Then we delegate to the general -# build_and_run_docker.sh script. - -# Change to repo root -cd $(dirname $0)/../../.. - -export DOCKERHUB_ORGANIZATION=protobuftesting -export DOCKERFILE_DIR=kokoro/linux/dockerfile/test/ruby -export DOCKER_RUN_SCRIPT=kokoro/linux/pull_request_in_docker.sh -export OUTPUT_DIR=testoutput -export TEST_SET="ruby30" -./kokoro/linux/build_and_run_docker.sh
diff --git a/kokoro/linux/ruby30/continuous.cfg b/kokoro/linux/ruby30/continuous.cfg deleted file mode 100644 index b03a335..0000000 --- a/kokoro/linux/ruby30/continuous.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/ruby30/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/ruby30/presubmit.cfg b/kokoro/linux/ruby30/presubmit.cfg deleted file mode 100644 index b03a335..0000000 --- a/kokoro/linux/ruby30/presubmit.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# Config file for running tests in Kokoro - -# Location of the build script in repository -build_file: "protobuf/kokoro/linux/ruby30/build.sh" -timeout_mins: 120 - -action { - define_artifacts { - regex: "**/sponge_log.xml" - } -}
diff --git a/kokoro/linux/ruby_aarch64/build.sh b/kokoro/linux/ruby_aarch64/build.sh deleted file mode 100755 index 6473e0d..0000000 --- a/kokoro/linux/ruby_aarch64/build.sh +++ /dev/null
@@ -1,16 +0,0 @@ -#!/bin/bash -# -# This is the top-level script we give to Kokoro as the entry point for -# running the "continuous" and "presubmit" jobs. - -set -ex - -# Change to repo root -cd $(dirname $0)/../../.. - -# Initialize any submodules. -git submodule update --init --recursive - -kokoro/linux/aarch64/qemu_helpers/prepare_qemu.sh - -kokoro/linux/aarch64/test_ruby_aarch64.sh
diff --git a/kokoro/linux/ruby_aarch64/continuous.cfg b/kokoro/linux/ruby_aarch64/continuous.cfg deleted file mode 100644 index ae82696..0000000 --- a/kokoro/linux/ruby_aarch64/continuous.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# 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/presubmit.cfg b/kokoro/linux/ruby_aarch64/presubmit.cfg deleted file mode 100644 index ae82696..0000000 --- a/kokoro/linux/ruby_aarch64/presubmit.cfg +++ /dev/null
@@ -1,11 +0,0 @@ -# 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/macos/ruby25/build.sh b/kokoro/macos/ruby25/build.sh deleted file mode 100755 index 48c8940..0000000 --- a/kokoro/macos/ruby25/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 -KOKORO_INSTALL_RVM=yes -source kokoro/macos/prepare_build_macos_rc - -./tests.sh ruby25
diff --git a/kokoro/macos/ruby25/continuous.cfg b/kokoro/macos/ruby25/continuous.cfg deleted file mode 100644 index b3755e4..0000000 --- a/kokoro/macos/ruby25/continuous.cfg +++ /dev/null
@@ -1,5 +0,0 @@ -# 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/presubmit.cfg b/kokoro/macos/ruby25/presubmit.cfg deleted file mode 100644 index b3755e4..0000000 --- a/kokoro/macos/ruby25/presubmit.cfg +++ /dev/null
@@ -1,5 +0,0 @@ -# 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/ruby26/build.sh b/kokoro/macos/ruby26/build.sh deleted file mode 100755 index 1b94fe1..0000000 --- a/kokoro/macos/ruby26/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 -KOKORO_INSTALL_RVM=yes -source kokoro/macos/prepare_build_macos_rc - -./tests.sh ruby26
diff --git a/kokoro/macos/ruby26/continuous.cfg b/kokoro/macos/ruby26/continuous.cfg deleted file mode 100644 index 688f63c..0000000 --- a/kokoro/macos/ruby26/continuous.cfg +++ /dev/null
@@ -1,5 +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
diff --git a/kokoro/macos/ruby26/presubmit.cfg b/kokoro/macos/ruby26/presubmit.cfg deleted file mode 100644 index 688f63c..0000000 --- a/kokoro/macos/ruby26/presubmit.cfg +++ /dev/null
@@ -1,5 +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
diff --git a/kokoro/macos/ruby27/build.sh b/kokoro/macos/ruby27/build.sh deleted file mode 100755 index baebdb7..0000000 --- a/kokoro/macos/ruby27/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 -KOKORO_INSTALL_RVM=yes -source kokoro/macos/prepare_build_macos_rc - -./tests.sh ruby27
diff --git a/kokoro/macos/ruby27/continuous.cfg b/kokoro/macos/ruby27/continuous.cfg deleted file mode 100644 index b10b455..0000000 --- a/kokoro/macos/ruby27/continuous.cfg +++ /dev/null
@@ -1,5 +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
diff --git a/kokoro/macos/ruby27/presubmit.cfg b/kokoro/macos/ruby27/presubmit.cfg deleted file mode 100644 index b10b455..0000000 --- a/kokoro/macos/ruby27/presubmit.cfg +++ /dev/null
@@ -1,5 +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
diff --git a/kokoro/macos/ruby30/build.sh b/kokoro/macos/ruby30/build.sh deleted file mode 100755 index b1e0641..0000000 --- a/kokoro/macos/ruby30/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 -KOKORO_INSTALL_RVM=yes -source kokoro/macos/prepare_build_macos_rc - -./tests.sh ruby30
diff --git a/kokoro/macos/ruby30/continuous.cfg b/kokoro/macos/ruby30/continuous.cfg deleted file mode 100644 index d505117..0000000 --- a/kokoro/macos/ruby30/continuous.cfg +++ /dev/null
@@ -1,5 +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
diff --git a/kokoro/macos/ruby30/presubmit.cfg b/kokoro/macos/ruby30/presubmit.cfg deleted file mode 100644 index d505117..0000000 --- a/kokoro/macos/ruby30/presubmit.cfg +++ /dev/null
@@ -1,5 +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
diff --git a/kokoro/release/ruby/linux/build_artifacts.sh b/kokoro/release/ruby/linux/build_artifacts.sh deleted file mode 100755 index 8855522..0000000 --- a/kokoro/release/ruby/linux/build_artifacts.sh +++ /dev/null
@@ -1,14 +0,0 @@ -#!/bin/bash - -set -ex - -# change to repo root -cd $(dirname $0)/../../../.. - -source kokoro/release/ruby/linux/prepare_build.sh - -# ruby environment -source kokoro/release/ruby/linux/ruby/ruby_build_environment.sh - -# build artifacts -bash kokoro/release/ruby/linux/ruby/ruby_build.sh
diff --git a/kokoro/release/ruby/linux/continuous.cfg b/kokoro/release/ruby/linux/continuous.cfg deleted file mode 100644 index dbc71b2..0000000 --- a/kokoro/release/ruby/linux/continuous.cfg +++ /dev/null
@@ -1,8 +0,0 @@ -# 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/prepare_build.sh b/kokoro/release/ruby/linux/prepare_build.sh deleted file mode 100755 index 91d1868..0000000 --- a/kokoro/release/ruby/linux/prepare_build.sh +++ /dev/null
@@ -1,12 +0,0 @@ -#!/bin/bash - -# Move docker's storage location to scratch disk so we don't run out of space. -echo 'DOCKER_OPTS="${DOCKER_OPTS} --graph=/tmpfs/docker"' | sudo tee --append /etc/default/docker -# Use container registry mirror for pulling docker images (should make downloads faster) -# See https://cloud.google.com/container-registry/docs/using-dockerhub-mirroring -echo 'DOCKER_OPTS="${DOCKER_OPTS} --registry-mirror=https://mirror.gcr.io"' | sudo tee --append /etc/default/docker -sudo service docker restart - -# All artifacts come here -mkdir artifacts -export ARTIFACT_DIR=$(pwd)/artifacts
diff --git a/kokoro/release/ruby/linux/presubmit.cfg b/kokoro/release/ruby/linux/presubmit.cfg deleted file mode 100644 index dbc71b2..0000000 --- a/kokoro/release/ruby/linux/presubmit.cfg +++ /dev/null
@@ -1,8 +0,0 @@ -# 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/release.cfg b/kokoro/release/ruby/linux/release.cfg deleted file mode 100644 index dbc71b2..0000000 --- a/kokoro/release/ruby/linux/release.cfg +++ /dev/null
@@ -1,8 +0,0 @@ -# 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/ruby/ruby_build.sh b/kokoro/release/ruby/linux/ruby/ruby_build.sh deleted file mode 100755 index f8ae962..0000000 --- a/kokoro/release/ruby/linux/ruby/ruby_build.sh +++ /dev/null
@@ -1,18 +0,0 @@ -#!/bin/bash - -set -ex - -# Build protoc -if test ! -e src/protoc; then - ./autogen.sh - ./configure - make -j4 -fi - -umask 0022 -pushd ruby -gem install bundler -v 2.1.4 -bundle update && bundle exec rake gem:native -ls pkg -mv pkg/* $ARTIFACT_DIR -popd
diff --git a/kokoro/release/ruby/linux/ruby/ruby_build_environment.sh b/kokoro/release/ruby/linux/ruby/ruby_build_environment.sh deleted file mode 100755 index 87c0f75..0000000 --- a/kokoro/release/ruby/linux/ruby/ruby_build_environment.sh +++ /dev/null
@@ -1,9 +0,0 @@ -#!/bin/bash - -set +ex -[[ -s /etc/profile.d/rvm.sh ]] && . /etc/profile.d/rvm.sh -set -e # rvm commands are very verbose -rvm --default use ruby-2.4.1 -# The version needs to be updated if the version specified in Gemfile.lock is changed -gem install bundler -v '1.17.3' -set -ex
diff --git a/kokoro/release/ruby/macos/build_artifacts.sh b/kokoro/release/ruby/macos/build_artifacts.sh deleted file mode 100755 index a109d45..0000000 --- a/kokoro/release/ruby/macos/build_artifacts.sh +++ /dev/null
@@ -1,16 +0,0 @@ -#!/bin/bash - -set -ex - -# change to repo root -cd $(dirname $0)/../../../.. - -# all artifacts come here -mkdir artifacts -export ARTIFACT_DIR=$(pwd)/artifacts - -# ruby environment -bash kokoro/release/ruby/macos/ruby/ruby_build_environment.sh - -# build artifacts -bash kokoro/release/ruby/macos/ruby/ruby_build.sh
diff --git a/kokoro/release/ruby/macos/continuous.cfg b/kokoro/release/ruby/macos/continuous.cfg deleted file mode 100644 index cb1c08b..0000000 --- a/kokoro/release/ruby/macos/continuous.cfg +++ /dev/null
@@ -1,8 +0,0 @@ -# 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/presubmit.cfg b/kokoro/release/ruby/macos/presubmit.cfg deleted file mode 100644 index cb1c08b..0000000 --- a/kokoro/release/ruby/macos/presubmit.cfg +++ /dev/null
@@ -1,8 +0,0 @@ -# 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/release.cfg b/kokoro/release/ruby/macos/release.cfg deleted file mode 100644 index cb1c08b..0000000 --- a/kokoro/release/ruby/macos/release.cfg +++ /dev/null
@@ -1,8 +0,0 @@ -# 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/ruby/ruby_build.sh b/kokoro/release/ruby/macos/ruby/ruby_build.sh deleted file mode 100755 index 7f6c18f..0000000 --- a/kokoro/release/ruby/macos/ruby/ruby_build.sh +++ /dev/null
@@ -1,17 +0,0 @@ -#!/bin/bash - -set -ex - -# Build protoc -if test ! -e src/protoc; then - ./autogen.sh - ./configure - make -j4 -fi - -umask 0022 -pushd ruby -bundle update && bundle exec rake gem:native -ls pkg -mv pkg/* $ARTIFACT_DIR -popd
diff --git a/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh deleted file mode 100755 index 0261207..0000000 --- a/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh +++ /dev/null
@@ -1,82 +0,0 @@ -#!/bin/bash - -set -ex - -# Fix permissions -sudo chown -R $(whoami) $HOME/.rvm/ -sudo chown -R $(whoami) /Library/Ruby/ - -set +ex # rvm script is very verbose and exits with errorcode -source $HOME/.rvm/scripts/rvm -set -e # rvm commands are very verbose -time rvm install 2.5.0 -rvm use 2.5.0 -gem install rake-compiler --no-document -# Pin to bundler with ruby 2.5 support -gem install bundler -v 2.3.26 --no-document -time rvm install 2.7.0 -rvm use 2.7.0 --default -gem install rake-compiler --no-document -gem install bundler --no-document -rvm osx-ssl-certs status all -rvm osx-ssl-certs update all -set -ex - -rm -rf ~/.rake-compiler - -CROSS_RUBY=$(mktemp tmpfile.XXXXXXXX) - -curl https://raw.githubusercontent.com/rake-compiler/rake-compiler/72184e51779b6a3b9b8580b036a052fdc3181ced/tasks/bin/cross-ruby.rake > "$CROSS_RUBY" - -# See https://github.com/grpc/grpc/issues/12161 for verconf.h patch details -patch "$CROSS_RUBY" << EOF ---- cross-ruby.rake 2020-12-11 11:17:53.000000000 +0900 -+++ patched 2020-12-11 11:18:52.000000000 +0900 -@@ -111,10 +111,12 @@ - "--host=#{MINGW_HOST}", - "--target=#{MINGW_TARGET}", - "--build=#{RUBY_BUILD}", -- '--enable-shared', -+ '--enable-static', -+ '--disable-shared', - '--disable-install-doc', -+ '--without-gmp', - '--with-ext=', -- 'LDFLAGS=-pipe -s', -+ 'LDFLAGS=-pipe', - ] - - # Force Winsock2 for Ruby 1.8, 1.9 defaults to it -@@ -130,6 +132,7 @@ - # make - file "#{build_dir}/ruby.exe" => ["#{build_dir}/Makefile"] do |t| - chdir File.dirname(t.prerequisites.first) do -+ sh "test -s verconf.h || rm -f verconf.h" # if verconf.h has size 0, make sure it gets re-built by make - sh MAKE - end - end -EOF - -MAKE="make -j8" - -set +x # rvm commands are very verbose -rvm use 2.7.0 -set -x -ruby --version | grep 'ruby 2.7.0' -for v in 3.0.0 2.7.0 ; do - ccache -c - rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin MAKE="$MAKE" - rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=aarch64-darwin MAKE="$MAKE" -done -set +x -rvm use 2.5.0 -set -x -ruby --version | grep 'ruby 2.5.0' -for v in 2.6.0 2.5.1; do - ccache -c - rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=x86_64-darwin MAKE="$MAKE" - rake -f "$CROSS_RUBY" cross-ruby VERSION="$v" HOST=aarch64-darwin MAKE="$MAKE" -done -set +x -rvm use 2.7.0 -set -x