Add JRuby test targets for JRuby 9.2.x and 9.3.x.
Standardize on JRuby 9.2.19.0 for building and for testing the 9.2.x branch.
This commit is contained in:
parent
9e49f0f46b
commit
728878e98f
18
kokoro/linux/jruby92/build.sh
Executable file
18
kokoro/linux/jruby92/build.sh
Executable file
@ -0,0 +1,18 @@
|
||||
#!/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
|
11
kokoro/linux/jruby92/continuous.cfg
Normal file
11
kokoro/linux/jruby92/continuous.cfg
Normal file
@ -0,0 +1,11 @@
|
||||
# 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"
|
||||
}
|
||||
}
|
11
kokoro/linux/jruby92/presubmit.cfg
Normal file
11
kokoro/linux/jruby92/presubmit.cfg
Normal file
@ -0,0 +1,11 @@
|
||||
# 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"
|
||||
}
|
||||
}
|
18
kokoro/linux/jruby93/build.sh
Executable file
18
kokoro/linux/jruby93/build.sh
Executable file
@ -0,0 +1,18 @@
|
||||
#!/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
|
11
kokoro/linux/jruby93/continuous.cfg
Normal file
11
kokoro/linux/jruby93/continuous.cfg
Normal file
@ -0,0 +1,11 @@
|
||||
# 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"
|
||||
}
|
||||
}
|
11
kokoro/linux/jruby93/presubmit.cfg
Normal file
11
kokoro/linux/jruby93/presubmit.cfg
Normal file
@ -0,0 +1,11 @@
|
||||
# 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"
|
||||
}
|
||||
}
|
@ -81,7 +81,7 @@
|
||||
<dependency>
|
||||
<groupId>org.jruby</groupId>
|
||||
<artifactId>jruby-complete</artifactId>
|
||||
<version>9.2.11.1</version>
|
||||
<version>9.2.19.0</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
@ -8,7 +8,7 @@ test_version() {
|
||||
|
||||
RUBY_CONFORMANCE=test_ruby
|
||||
|
||||
if [ "$version" == "jruby-9.2.11.1" ] ; then
|
||||
if [[ $version == jruby-9* ] ; then
|
||||
bash --login -c \
|
||||
"rvm install $version && rvm use $version && rvm get head && \
|
||||
which ruby && \
|
||||
|
13
tests.sh
13
tests.sh
@ -452,10 +452,16 @@ build_ruby30() {
|
||||
cd ruby && bash travis-test.sh ruby-3.0.2 && cd ..
|
||||
}
|
||||
|
||||
build_jruby() {
|
||||
build_jruby92() {
|
||||
internal_build_cpp # For conformance tests.
|
||||
internal_build_java jdk8 && cd .. # For Maven protobuf jar with local changes
|
||||
cd ruby && bash travis-test.sh jruby-9.2.11.1 && cd ..
|
||||
cd ruby && bash travis-test.sh jruby-9.2.19.0 && cd ..
|
||||
}
|
||||
|
||||
build_jruby93() {
|
||||
internal_build_cpp # For conformance tests.
|
||||
internal_build_java jdk8 && cd .. # For Maven protobuf jar with local changes
|
||||
cd ruby && bash travis-test.sh jruby-9.3.0.0 && cd ..
|
||||
}
|
||||
|
||||
build_javascript() {
|
||||
@ -610,7 +616,8 @@ Usage: $0 { cpp |
|
||||
ruby26 |
|
||||
ruby27 |
|
||||
ruby30 |
|
||||
jruby |
|
||||
jruby92 |
|
||||
jruby93 |
|
||||
ruby_all |
|
||||
php_all |
|
||||
php_all_32 |
|
||||
|
Loading…
Reference in New Issue
Block a user