From 41e89c7d5ce7c19e0bb8807d155e7fa1bd761ee6 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Thu, 24 Jun 2021 18:21:49 +0000 Subject: [PATCH 1/2] Don't test kotlin if not in jdk8 --- tests.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests.sh b/tests.sh index 923201a821..9eddd540ee 100755 --- a/tests.sh +++ b/tests.sh @@ -226,8 +226,13 @@ build_java_with_conformance_tests() { # This local installation avoids the problem caused by a new version not yet in Maven Central cd java/bom && $MVN install cd ../.. - cd java && $MVN test && $MVN install - cd util && $MVN package assembly:single + cd java/core && $MVN test && $MVN install + cd ../lite && $MVN test && $MVN install + cd ../util && $MVN package assembly:single + if [ "$version" == "jdk8" ]; then + cd ../kotlin && $MVN test && $MVN install + cd ../kotlin-lite && $MVN test && $MVN install + fi cd ../.. cd conformance && make test_java && cd .. } From 1e8457f8f800772117576387acc74fc704b47001 Mon Sep 17 00:00:00 2001 From: Deanna Garcia Date: Thu, 24 Jun 2021 22:06:55 +0000 Subject: [PATCH 2/2] Adding util tests --- tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests.sh b/tests.sh index 9eddd540ee..f633881af8 100755 --- a/tests.sh +++ b/tests.sh @@ -228,7 +228,7 @@ build_java_with_conformance_tests() { cd ../.. cd java/core && $MVN test && $MVN install cd ../lite && $MVN test && $MVN install - cd ../util && $MVN package assembly:single + cd ../util && $MVN test && $MVN install && $MVN package assembly:single if [ "$version" == "jdk8" ]; then cd ../kotlin && $MVN test && $MVN install cd ../kotlin-lite && $MVN test && $MVN install