From 1aaafeb57b651c73f85bdf4fd5ece0b305974636 Mon Sep 17 00:00:00 2001
From: Edward Hennis <ed@ripple.com>
Date: Mon, 30 Nov 2020 12:53:43 -0500
Subject: [PATCH] Reset corrupt / inconsistent dependency source folders:

* Also display some more information about the build
---
 .travis.yml                     |  2 ++
 bin/ci/ubuntu/build-and-test.sh | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index d743c0a364..ca2521dbce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -425,6 +425,8 @@ before_cache:
   - cd ${TRAVIS_HOME}
   - if [ -f cache_ignore.tar ] ; then $SUDO tar xvf cache_ignore.tar; fi
   - cd ${TRAVIS_BUILD_DIR}
+  # Display what changed in the cache before updating the cache
+  - find $CACHE_DIR -mmin -30 -ls
 
 cache:
   timeout: 900
diff --git a/bin/ci/ubuntu/build-and-test.sh b/bin/ci/ubuntu/build-and-test.sh
index 1f9da09b88..92d8bc10e4 100755
--- a/bin/ci/ubuntu/build-and-test.sh
+++ b/bin/ci/ubuntu/build-and-test.sh
@@ -95,8 +95,32 @@ fi
 mkdir -p "build/${BUILD_DIR}"
 pushd "build/${BUILD_DIR}"
 
+# cleanup possible artifacts
+rm -fv CMakeFiles/CMakeOutput.log CMakeFiles/CMakeError.log
+# Clean up NIH directories which should be git repos, but aren't
+for nih_path in ${NIH_CACHE_ROOT}/*/*/*/src ${NIH_CACHE_ROOT}/*/*/src
+do
+  for dir in lz4 snappy rocksdb
+  do
+    if [ -e ${nih_path}/${dir} -a \! -e ${nih_path}/${dir}/.git ]
+    then
+      ls -la ${nih_path}/${dir}*
+      rm -rfv ${nih_path}/${dir}*
+    fi
+  done
+done
+
 # generate
 ${time} cmake ../.. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ${CMAKE_EXTRA_ARGS}
+# Display the cmake output, to help with debugging if something fails
+for file in CMakeOutput.log CMakeError.log
+do
+  if [ -f CMakeFiles/${file} ]
+  then
+    ls -l CMakeFiles/${file}
+    cat CMakeFiles/${file}
+  fi
+done
 # build
 export DESTDIR=$(pwd)/_INSTALLED_