From 3b102da857192c68a937475d5cbdba4c1a16ddc6 Mon Sep 17 00:00:00 2001
From: Alexandre Archambault <alexandre.archambault@gmail.com>
Date: Tue, 31 Jan 2017 15:23:03 +0100
Subject: [PATCH] Run sbt-shading tests on CI

---
 .ci/travis.sh |  4 ++--
 appveyor.yml  | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/.ci/travis.sh b/.ci/travis.sh
index 9a1c66ac8..e81ac14dc 100755
--- a/.ci/travis.sh
+++ b/.ci/travis.sh
@@ -43,7 +43,7 @@ function isMasterOrDevelop() {
 
 SBT_COMMANDS="compile test it:test"
 
-RUN_SHADING_TESTS=0
+RUN_SHADING_TESTS=1
 
 if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then
   SBT_COMMANDS="$SBT_COMMANDS publishLocal" # to make the scripted tests happy
@@ -68,7 +68,7 @@ if echo "$TRAVIS_SCALA_VERSION" | grep -q "^2\.10"; then
       rm -rf jarjar
     fi
 
-    SBT_COMMANDS="$SBT_COMMANDS sbt-shading/scripted"
+    SBT_COMMANDS="$SBT_COMMANDS plugin/publishLocal sbt-shading/scripted"
   fi
 fi
 
diff --git a/appveyor.yml b/appveyor.yml
index c9ad467a4..8b1a98d8d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -14,15 +14,14 @@ install:
   - cmd: SET PATH=C:\sbt\sbt\bin;%JAVA_HOME%\bin;%PATH%
   - cmd: SET SBT_OPTS=-XX:MaxPermSize=2g -Xmx4g
   - cmd: SET COURSIER_NO_TERM=1
-  # required by the sbt-shading scripted tests, disabled for now (see below)
-  # ps: |
-  #   if (!(Test-Path 'C:\Users\appveyor\.m2\repository\org\anarres\jarjar\jarjar-core\1.0.1-coursier-SNAPSHOT')) {
-  #     iex 'git clone https://github.com/alexarchambault/jarjar'
-  #     Set-Location -Path jarjar
-  #     iex 'git checkout 249c8dbb970f8'
-  #     iex './gradlew.bat :jarjar-core:install'
-  #     Set-Location -Path ..
-  #   }
+  - ps: |
+      if (!(Test-Path 'C:\Users\appveyor\.m2\repository\org\anarres\jarjar\jarjar-core\1.0.1-coursier-SNAPSHOT')) {
+        iex 'git clone https://github.com/alexarchambault/jarjar'
+        Set-Location -Path jarjar
+        iex 'git checkout 249c8dbb970f8'
+        iex './gradlew.bat :jarjar-core:install'
+        Set-Location -Path ..
+      }
 build_script:
   - sbt ++2.11.8 clean compile coreJVM/publishLocal http-server/publishLocal
   - sbt ++2.10.6 clean compile
@@ -31,9 +30,7 @@ test_script:
   - ps: Start-Job { & java -jar -noverify C:\projects\coursier\coursier launch -r http://dl.bintray.com/scalaz/releases io.get-coursier:http-server-java7_2.11:1.0.0-SNAPSHOT -- -d /C:/projects/coursier/tests/jvm/src/test/resources/test-repo/http/abc.com -u user -P pass -r realm -v }
   - sbt ++2.12.0 testsJVM/test testsJVM/it:test # Would node be around for testsJS/test?
   - sbt ++2.11.8 testsJVM/test testsJVM/it:test
-  - sbt ++2.10.6 testsJVM/test testsJVM/it:test plugin/scripted
-  # not running the scripted tests of sbt-shading here, as these seem to fail randomly on single core machines
-  # (which is kind of worrying)
+  - sbt ++2.10.6 testsJVM/test testsJVM/it:test plugin/scripted plugin/publishLocal sbt-shading/scripted
 cache:
   - C:\Users\appveyor\.ivy2
   - C:\Users\appveyor\.m2