This is an automated email from the ASF dual-hosted git repository.
mck pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git
The following commit(s) were added to refs/heads/trunk by this push:
new b626e79 ninja-fix – only build dtest jars on branches the current jdk
works with (trunk doesn't build w/ 8 anymore)
b626e79 is described below
commit b626e79275b9451506082b70d222d3895caf0882
Author: Mick Semb Wever <[email protected]>
AuthorDate: Thu Jul 27 14:07:18 2023 +0200
ninja-fix – only build dtest jars on branches the current jdk works with
(trunk doesn't build w/ 8 anymore)
---
build-scripts/cassandra-test.sh | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/build-scripts/cassandra-test.sh b/build-scripts/cassandra-test.sh
index 46b372a..bfce947 100755
--- a/build-scripts/cassandra-test.sh
+++ b/build-scripts/cassandra-test.sh
@@ -43,11 +43,20 @@ _build_all_dtest_jars() {
git checkout $branch
if [ "$java_version" -eq 11 ] && ! grep -q "CASSANDRA_USE_JDK11"
build.xml ; then
echo "Skipping dtest-jar jdk11 build of ${branch}."
- else
- ant realclean
- ant jar dtest-jar
- cp build/dtest*.jar ../../build/
+ continue
fi
+ if grep -q 'property\s*name="java.supported"' build.xml ; then
+ # check if the branch supports the java version (when
"java.supported" is set in build.xml)
+ java_version_supported=`grep 'property\s*name="java.supported"'
build.xml |sed -ne 's/.*value="\([^"]*\)".*/\1/p'`
+ regx_java_version="(${java_version_supported//,/|})"
+ if [[ ! "$java_version" =~ $regx_java_version ]] ; then
+ echo "Skipping dtest-jar jdk${java_version} build of ${branch}."
+ continue
+ fi
+ fi
+ ant realclean
+ ant jar dtest-jar
+ cp build/dtest*.jar ../../build/
done
cd ../..
rm -fR ${TMP_DIR}/cassandra-dtest-jars
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
