From: kennytm <kennytm@gmail.com>
Date: Thu, 22 Mar 2018 09:52:57 +0000 (+0800)
Subject: Revert "Temporarily disable dist-ing RLS, Rustfmt and Clippy."
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=a4bc8590117f313ab2c895ab91f183f368369e2b;p=rust.git

Revert "Temporarily disable dist-ing RLS, Rustfmt and Clippy."

This reverts commit 9f792e199bc53a75afdad72547a151a0bc86ec5d.
---

diff --git a/src/ci/run.sh b/src/ci/run.sh
index afa6d1fa0ae..e3f38e4834a 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -105,15 +105,7 @@ fi
 travis_fold end log-system-info
 
 if [ ! -z "$SCRIPT" ]; then
-  # FIXME(#49246): Re-enable these tools after #49246 has been merged and thus fixing the cache.
-  if [ "$DEPLOY_ALT" = 1 ]; then
-    sh -x -c "$SCRIPT \
-       --exclude src/tools/rls \
-       --exclude src/tools/rustfmt \
-       --exclude src/tools/clippy"
-  else
-    sh -x -c "$SCRIPT"
-  fi
+  sh -x -c "$SCRIPT"
 else
   do_make() {
     travis_fold start "make-$1"