AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Run kotlin tests on JDK 8 *and later* (#9949)

Browse Source 
@deannagarcia fixes #9870
This commit is contained in:
Elliotte Rusty Harold 2022-05-11 16:50:10 +00:00 committed by GitHub
parent b2a51f8525
commit 309e24e86a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests.sh
View File

@ -246,8 +246,8 @@ build_java() {
cd ../.. cd ../..
} }
# The conformance tests are hard-coded to work with the $ROOT/java directory. # The conformance tests are hard-coded to work with the $ROOT/java directory
# So this can't run in parallel with two different sets of tests. # so this can't run in parallel with two different sets of tests.
build_java_with_conformance_tests() { build_java_with_conformance_tests() {
# Java build needs `protoc`. # Java build needs `protoc`.
internal_build_cpp internal_build_cpp
@ -257,7 +257,7 @@ build_java_with_conformance_tests() {
cd java/core && $MVN test && $MVN install cd java/core && $MVN test && $MVN install
cd ../lite && $MVN test && $MVN install cd ../lite && $MVN test && $MVN install
cd ../util && $MVN test && $MVN install && $MVN package assembly:single cd ../util && $MVN test && $MVN install && $MVN package assembly:single
if [ "$version" == "jdk8" ]; then if [ "$version" != "jdk7" ]; then
cd ../kotlin && $MVN test && $MVN install cd ../kotlin && $MVN test && $MVN install
cd ../kotlin-lite && $MVN test && $MVN install cd ../kotlin-lite && $MVN test && $MVN install
fi fi