[cassandra-builds] 01/02: ninja-fix building cassandra-2.2 artefacts

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-builds.git

commit 32d110a0896f8748670775202d6050da9d451981
Author: Mick Semb Wever <mc...@apache.org>
AuthorDate: Mon Oct 31 21:34:34 2022 +0100

    ninja-fix building cassandra-2.2 artefacts
---
 docker/build-debs.sh | 3 ++-
 docker/build-rpms.sh | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/build-debs.sh b/docker/build-debs.sh
index 4484d98..52e323a 100755
--- a/docker/build-debs.sh
+++ b/docker/build-debs.sh
@@ -118,7 +118,8 @@ javac -version
 # Pre-download dependencies, loop to prevent failures
 set +e
 for x in $(seq 1 3); do
-    ant clean resolver-dist-lib
+    # maven-ant-tasks-retrieve-build is for cassandra-2.2 support
+    ant realclean clean resolver-dist-lib || ant realclean maven-ant-tasks-retrieve-build
     RETURN="$?"
     if [ "${RETURN}" -eq "0" ]; then break ; fi
     sleep 3
diff --git a/docker/build-rpms.sh b/docker/build-rpms.sh
index 7382228..651a7e4 100755
--- a/docker/build-rpms.sh
+++ b/docker/build-rpms.sh
@@ -107,7 +107,8 @@ javac -version
 # Pre-download dependencies, loop to prevent failures
 set +e
 for x in $(seq 1 3); do
-    ant clean resolver-dist-lib
+    # maven-ant-tasks-retrieve-build is for cassandra-2.2 support
+    ant realclean clean resolver-dist-lib || ant realclean maven-ant-tasks-retrieve-build
     RETURN="$?"
     if [ "${RETURN}" -eq "0" ]; then break ; fi
     sleep 3


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org