From e2d2bd61f479fa7128f97a1b5b1623632855ffd0 Mon Sep 17 00:00:00 2001 From: Stefan Miklosovic Date: Thu, 19 Oct 2023 21:34:30 +0200 Subject: [PATCH] ninja-fix nested cassandra clone for dtest jar building re-use check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (git -C … will fall back to parent level .git repo, confusing the check) patch by Mick Semb Wever; reviewed by Štefan Miklošovič for CASSANDRA-18936,CASSANDRA-18665 --- .build/run-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.build/run-tests.sh b/.build/run-tests.sh index 6736a159b5..9eaf8b0833 100755 --- a/.build/run-tests.sh +++ b/.build/run-tests.sh @@ -86,7 +86,7 @@ _build_all_dtest_jars() { cp "${TMP_DIR}/cassandra-dtest-jars/build/dtest-${dtest_jar_version}.jar" ${DIST_DIR}/ fi - if [ -d ${TMP_DIR}/cassandra-dtest-jars ] && [ "https://github.com/apache/cassandra.git" == "$(git -C ${TMP_DIR}/cassandra-dtest-jars remote get-url origin)" ] ; then + if [ -d ${TMP_DIR}/cassandra-dtest-jars/.git ] && [ "https://github.com/apache/cassandra.git" == "$(git -C ${TMP_DIR}/cassandra-dtest-jars remote get-url origin)" ] ; then echo "Reusing ${TMP_DIR}/cassandra-dtest-jars for past branch dtest jars" if [ "x" == "x${OFFLINE}" ] ; then until git -C ${TMP_DIR}/cassandra-dtest-jars fetch --quiet origin ; do echo "git -C ${TMP_DIR}/cassandra-dtest-jars fetch failed… trying again… " ; done