Revert 1.x-beta change

sbt · Jan 8, 2018 · 02e6ca8 · 02e6ca8
1 parent b569a4a
commit 02e6ca8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.travis/publish-site.sh b/.travis/publish-site.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -ex
 
-if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "1.x-beta" && "${TRAVIS_REPO_SLUG}" == "sbt/website" ]]; then
+if [[ "${TRAVIS_PULL_REQUEST}" == "false" && "${TRAVIS_BRANCH}" == "1.x" && "${TRAVIS_REPO_SLUG}" == "sbt/website" ]]; then
   openssl version
   echo -e "Host github.com\n\tStrictHostKeyChecking no\nIdentityFile ~/.ssh/deploy_rsa\n" >> ~/.ssh/config
   openssl aes-256-cbc -K $encrypted_e29f8a2ff2bf_key -iv $encrypted_e29f8a2ff2bf_iv -in .travis/deploy_rsa.enc -out .travis/deploy_rsa -d

diff --git a/build.sbt b/build.sbt
@@ -15,11 +15,10 @@ lazy val root = (project in file("."))
     siteSubdirName in Pamflet := s"""$targetSbtBinaryVersion/docs""",
     tutorialSubDirName := s"""$targetSbtBinaryVersion/tutorial""",
     // Redirects
-    // redirectSettings,
-    // SiteHelpers.addMappingsToSiteDir(mappings in Redirect, siteSubdirName in Pamflet),
-    // redirectTutorialSettings,
-    // SiteHelpers.addMappingsToSiteDir(mappings in RedirectTutorial, tutorialSubDirName),
-
+    redirectSettings,
+    SiteHelpers.addMappingsToSiteDir(mappings in Redirect, siteSubdirName in Pamflet),
+    redirectTutorialSettings,
+    SiteHelpers.addMappingsToSiteDir(mappings in RedirectTutorial, tutorialSubDirName),
     // GitHub Pages. See project/Docs.scala
     customGhPagesSettings,
     // NOTE - PDF settings must be done externally like this because pdf generation generically looks