This is an automated email from the ASF dual-hosted git repository.
wangdan pushed a commit to branch v2.5
in repository https://gitbox.apache.org/repos/asf/incubator-pegasus.git
The following commit(s) were added to refs/heads/v2.5 by this push:
new 0aebd1055 fix: generate thrift sources for scala client (cherry-pick
#1662) (#1669)
0aebd1055 is described below
commit 0aebd1055d2601b126fa8ac598f24d5c34430028
Author: Dan Wang <[email protected]>
AuthorDate: Thu Nov 2 14:18:48 2023 +0800
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 c1b1f2346..935ee9636 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 9b721c6ed..dddb168ef 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 ..
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
