Skip to content

Commit 8c88821

Browse files
committed
Clean even better.
1 parent 999a756 commit 8c88821

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

admin/build.ps1

+5-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ Function ensureVersion() {
1616
}
1717

1818
Function clearIvyCache() {
19-
remove-item -erroraction ignore -force $homeDir\.ivy2\exclude_classifiers, $homeDir\.ivy2\exclude_classifiers.lock
20-
remove-item -erroraction ignore -force -recurse $homeDir\.ivy2\cache\org.scala-lang
21-
remove-item -erroraction ignore -force -recurse $homeDir\.ivy2\local\org.scala-lang
22-
get-childitem -erroraction ignore -path $homeDir\.ivy2 -recurse -include "*compiler-interface*$env:version*" | remove-item -force -recurse
23-
get-childitem -erroraction ignore -path $homeDir\.sbt -recurse -include "*compiler-interface*$env:version*" | remove-item -force -recurse
19+
remove-item -erroraction ignore -force -verbose $homeDir\.ivy2\exclude_classifiers, $homeDir\.ivy2\exclude_classifiers.lock
20+
remove-item -erroraction ignore -force -verbose -recurse $homeDir\.ivy2\cache\org.scala-lang, $homeDir\.ivy2\cache\org.scala-lang.modules
21+
remove-item -erroraction ignore -force -verbose -recurse $homeDir\.ivy2\local\org.scala-lang, $homeDir\.ivy2\local\org.scala-lang.modules
22+
get-childitem -erroraction ignore -path $homeDir\.ivy2 -recurse -include "*compiler-interface*$env:version*" | remove-item -force -recurse -verbose
23+
get-childitem -erroraction ignore -path $homeDir\.sbt -recurse -include "*compiler-interface*$env:version*" | remove-item -force -recurse -verbose
2424
}
2525

2626
# oh boy. i don't (want to) fully understand, but executing commands and redirecting is difficult.

admin/build.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ function triggerSmoketest() {
7171
}
7272

7373
clearIvyCache() {
74-
rm -f $HOME/.ivy2/exclude_classifiers $HOME/.ivy2/exclude_classifiers.lock
75-
rm -rf $HOME/.ivy2/cache/org.scala-lang
76-
rm -rf $HOME/.ivy2/local/org.scala-lang
77-
if [ -d $HOME/.ivy2 ]; then find $HOME/.ivy2 -name "*compiler-interface*$version*" | xargs rm -rf; fi
78-
if [ -d $HOME/.sbt ]; then find $HOME/.sbt -name "*compiler-interface*$version*" | xargs rm -rf; fi
74+
rm -fv $HOME/.ivy2/exclude_classifiers $HOME/.ivy2/exclude_classifiers.lock
75+
rm -rfv $HOME/.ivy2/cache/org.scala-lang $HOME/.ivy2/cache/org.scala-lang.modules
76+
rm -rfv $HOME/.ivy2/local/org.scala-lang $HOME/.ivy2/local/org.scala-lang.modules
77+
if [ -d $HOME/.ivy2 ]; then find $HOME/.ivy2 -name "*compiler-interface*$version*" | xargs rm -rfv; fi
78+
if [ -d $HOME/.sbt ]; then find $HOME/.sbt -name "*compiler-interface*$version*" | xargs rm -rfv; fi
7979
}
8080

8181
if [[ "$TRAVIS_EVENT_TYPE" == "api" ]]; then

0 commit comments

Comments
 (0)