Merge pull request #185 from lrytz/ivy-cache

clear ivy cache

Author: lrytz

admin/build.ps1

@@ -7,13 +7,6 @@ Function checkExit() {
   }
 }
 
-# oh boy. i don't (want to) fully understand, but executing commands and redirecting is difficult.
-#  - https://mnaoumov.wordpress.com/2015/01/11/execution-of-external-commands-in-powershell-done-right/
-#  - https://stackoverflow.com/a/35980675/248998
-# letting cmd do the redirect avoids confusing powershell.
-& cmd /c 'java -version' '2>&1'
-checkExit
-
 Function ensureVersion() {
   $verPat="^[0-9]+\.[0-9]+\.[0-9]+(-[A-Za-z0-9-]+)?$"
   if ($env:version -notmatch $verPat) {
@@ -22,8 +15,28 @@ Function ensureVersion() {
   }
 }
 
+Function clearIvyCache() {
+  if (test-path C:\Users\appveyor\.ivy2\cache\org.scala-lang) {
+    remove-item -force -recurse C:\Users\appveyor\.ivy2\cache\org.scala-lang
+  }
+  if (test-path C:\Users\appveyor\.ivy2) {
+    get-childitem -path C:\Users\appveyor\.ivy2 -recurse -include "*compiler-interface*$env:version*" | remove-item -force -recurse
+  }
+  if (test-path C:\Users\appveyor\.sbt) {
+    get-childitem -path C:\Users\appveyor\.sbt -recurse -include "*compiler-interface*$env:version*" | remove-item -force -recurse
+  }
+}
+
+# oh boy. i don't (want to) fully understand, but executing commands and redirecting is difficult.
+#  - https://mnaoumov.wordpress.com/2015/01/11/execution-of-external-commands-in-powershell-done-right/
+#  - https://stackoverflow.com/a/35980675/248998
+# letting cmd do the redirect avoids confusing powershell.
+& cmd /c 'java -version' '2>&1'
+checkExit
+
 if ($env:APPVEYOR_FORCED_BUILD -eq 'true') {
   ensureVersion
+  clearIvyCache
   if ($env:mode -eq 'release') {
     echo "Running a release for $env:version"
     $repositoriesFile="$env:APPVEYOR_BUILD_FOLDER\conf\repositories"
@@ -34,8 +47,10 @@ if ($env:APPVEYOR_FORCED_BUILD -eq 'true') {
     Exit 1
   }
 } else {
+  $env:version="2.12.4"
+  clearIvyCache
   # By default, test building the packages (but don't uplaod)
   # Need to redirect stderr, otherwise any error output (like jvm warning) fails the build (ErrorActionPreference)
-  & cmd /c 'sbt "-Dproject.version=2.12.4" "show s3Upload::mappings"' '2>&1'
+  & cmd /c "sbt ""-Dproject.version=$env:version"" ""show s3Upload::mappings""" '2>&1'
   checkExit
 }

admin/build.sh

@@ -70,8 +70,15 @@ function triggerSmoketest() {
   }
 }
 
+clearIvyCache() {
+  rm -rf $HOME/.ivy2/cache/org.scala-lang
+  if [ -d $HOME/.ivy2 ]; then find $HOME/.ivy2 -name "*compiler-interface*$version*" | xargs rm -rf; fi
+  if [ -d $HOME/.sbt ]; then find $HOME/.sbt -name "*compiler-interface*$version*" | xargs rm -rf; fi
+}
+
 if [[ "$TRAVIS_EVENT_TYPE" == "api" ]]; then
   ensureVersion
+  clearIvyCache
   if [[ "$mode" == "archives" ]]; then
     echo "Running 'archives' for $version"
     setupSSH
@@ -95,6 +102,8 @@ if [[ "$TRAVIS_EVENT_TYPE" == "api" ]]; then
     exit 1
   fi
 else
+  version="2.12.4"
+  clearIvyCache
   # By default, test building the packages (but don't uplaod)
-  sbt -Dproject.version=2.12.4 "show s3Upload::mappings"
+  sbt -Dproject.version=$version "show s3Upload::mappings"
 fi

appveyor.yml

@@ -33,6 +33,6 @@ on_failure:
   - ps: postCommitStatus "failure"
 
 cache:
-  - C:\sbt\
-  - C:\Users\appveyor\.m2
+  - C:\sbt
+  - C:\Users\appveyor\.sbt
   - C:\Users\appveyor\.ivy2