From 89860077fa09d8c20979e6abb0fe75146c442e81 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 15 Jun 2021 01:38:41 -0700 Subject: [PATCH] Clean cache on upstream update --- scripts/upstreamMerge.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/upstreamMerge.sh b/scripts/upstreamMerge.sh index 02376dc7a2..319a71695d 100755 --- a/scripts/upstreamMerge.sh +++ b/scripts/upstreamMerge.sh @@ -34,6 +34,7 @@ fi if [ "$updated" == "1" ]; then echo "Rebuilding patches without filtering to improve apply ability" cd "$basedir" + ./gradlew cleanCache || exit 1 # todo: Figure out why this is necessary ./gradlew applyPatches -Dpaperweight.debug=true || exit 1 ./gradlew rebuildPatches || exit 1 fi