From 0aebd1055d2601b126fa8ac598f24d5c34430028 Mon Sep 17 00:00:00 2001 From: Dan Wang Date: Thu, 2 Nov 2023 14:18:48 +0800 Subject: [PATCH] fix: generate thrift sources for scala client (cherry-pick #1662) (#1669) https://github.com/apache/incubator-pegasus/issues/1663 Scala client depends on java client. Before java client is built, thrift sources should be generated. This PR is to cherry-pick #1662 into v2.5 to solve issue #1663. --- java-client/scripts/ci-test.sh | 4 ++-- scala-client/scripts/ci-test.sh | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/java-client/scripts/ci-test.sh b/java-client/scripts/ci-test.sh index c1b1f2346b..935ee96369 100755 --- a/java-client/scripts/ci-test.sh +++ b/java-client/scripts/ci-test.sh @@ -59,8 +59,8 @@ cd ../ pushd scripts -echo "bash recompile_thrift.sh" -bash recompile_thrift.sh +echo "run recompile_thrift.sh" +./recompile_thrift.sh popd mvn spotless:apply diff --git a/scala-client/scripts/ci-test.sh b/scala-client/scripts/ci-test.sh index 9b721c6edd..dddb168ef3 100755 --- a/scala-client/scripts/ci-test.sh +++ b/scala-client/scripts/ci-test.sh @@ -43,6 +43,10 @@ sbt scalafmtSbtCheck scalafmtCheck test:scalafmtCheck git clone https://github.com/apache/incubator-pegasus.git cd incubator-pegasus/java-client git checkout master +cd scripts +echo "run recompile_thrift.sh" +./recompile_thrift.sh +cd .. mvn clean package -DskipTests -Dcheckstyle.skip=true mvn clean install -DskipTests -Dcheckstyle.skip=true cd ..