You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by mc...@apache.org on 2023/10/17 10:16:01 UTC
[cassandra] branch trunk updated (302b272b14 -> 3d15be1d5e)
This is an automated email from the ASF dual-hosted git repository.
mck pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
from 302b272b14 Merge branch 'cassandra-5.0' into trunk
add 802bd5fe13 ninja-fix – reusing git clone under build needs reset and permissions
new 3d15be1d5e Merge branch 'cassandra-5.0' into trunk
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.build/run-tests.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[cassandra] 01/01: Merge branch 'cassandra-5.0' into trunk
Posted by mc...@apache.org.
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.git
commit 3d15be1d5ea35c63f93e07e9c158a657a8e37ee8
Merge: 302b272b14 802bd5fe13
Author: mck <mc...@apache.org>
AuthorDate: Tue Oct 17 12:14:46 2023 +0200
Merge branch 'cassandra-5.0' into trunk
* cassandra-5.0:
ninja-fix – reusing git clone under build needs reset and permissions
.build/run-tests.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --cc .build/run-tests.sh
index cf2fb04354,cf5ddcc1b8..35b166f863
--- a/.build/run-tests.sh
+++ b/.build/run-tests.sh
@@@ -102,7 -104,8 +105,8 @@@ _build_all_dtest_jars()
[ "${java_version}" -eq 11 ] && export CASSANDRA_USE_JDK11=true
pushd ${TMP_DIR}/cassandra-dtest-jars >/dev/null
- for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 ; do
+ for branch in cassandra-4.0 cassandra-4.1 cassandra-5.0 trunk ; do
+ git reset --hard HEAD && git clean -qxdff || echo "failed to reset/clean ${TMP_DIR}/cassandra-dtest-jars… continuing…"
git checkout --quiet $branch
dtest_jar_version=$(grep 'property\s*name=\"base.version\"' build.xml |sed -ne 's/.*value=\"\([^"]*\)\".*/\1/p')
if [ -f "${DIST_DIR}/dtest-${dtest_jar_version}.jar" ] ; then
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org