about summary refs log tree commit diff
path: root/src/doc/rustc-dev-guide
diff options
context:
space:
mode:
authorMark Mansi <markm@cs.wisc.edu>2019-11-05 11:18:49 -0600
committerWho? Me?! <mark-i-m@users.noreply.github.com>2019-11-05 11:58:33 -0600
commit05185d2d7be648979ea9c897391932f00c5eaea8 (patch)
tree0e32a7e1339798887eab91c25ab7b5aebd58ec01 /src/doc/rustc-dev-guide
parent996acad260a3879abf946b79769696962ef09779 (diff)
remove all the hacks, add some improvements
Diffstat (limited to 'src/doc/rustc-dev-guide')
-rw-r--r--src/doc/rustc-dev-guide/.travis.yml4
-rw-r--r--src/doc/rustc-dev-guide/book.toml3
-rwxr-xr-xsrc/doc/rustc-dev-guide/ci/build.sh10
-rwxr-xr-xsrc/doc/rustc-dev-guide/ci/install.sh4
4 files changed, 6 insertions, 15 deletions
diff --git a/src/doc/rustc-dev-guide/.travis.yml b/src/doc/rustc-dev-guide/.travis.yml
index dedec45685a..50b7d6b955a 100644
--- a/src/doc/rustc-dev-guide/.travis.yml
+++ b/src/doc/rustc-dev-guide/.travis.yml
@@ -4,7 +4,7 @@ rust:
 cache:
 - cargo
 - directories:
-  - $HOME/linkcheck/
+  - book/linkcheck/
 before_install:
 - shopt -s globstar
 - MAX_LINE_LENGTH=100 bash ci/check_line_lengths.sh src/**/*.md
@@ -12,7 +12,7 @@ install:
 - source ~/.cargo/env || true
 - bash -x ci/install.sh
 script:
-- bash -x ci/build.sh
+- mdbook build
 - mdbook test
 notifications:
   email:
diff --git a/src/doc/rustc-dev-guide/book.toml b/src/doc/rustc-dev-guide/book.toml
index 1d207bf22af..b5bced996d0 100644
--- a/src/doc/rustc-dev-guide/book.toml
+++ b/src/doc/rustc-dev-guide/book.toml
@@ -11,6 +11,7 @@ create-missing = false
 [output.html.search]
 
 [output.linkcheck]
-command = "sed 's/.*//'" # tell mdbook not to run, since we want to run it manually
 follow-web-links = true
 exclude = [ "crates\\.io", "gcc\\.godbolt\\.org", "youtube\\.com", "dl\\.acm\\.org" ]
+cache-timeout = 172800
+warning-policy = "error"
diff --git a/src/doc/rustc-dev-guide/ci/build.sh b/src/doc/rustc-dev-guide/ci/build.sh
deleted file mode 100755
index 504957b3f4e..00000000000
--- a/src/doc/rustc-dev-guide/ci/build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash -x
-
-set -e
-
-mkdir -p book/
-cp -r $HOME/linkcheck/ book/
-RUST_LOG=mdbook_linkcheck=debug mdbook-linkcheck -s
-cp -r book/linkcheck $HOME/
-
-mdbook build
diff --git a/src/doc/rustc-dev-guide/ci/install.sh b/src/doc/rustc-dev-guide/ci/install.sh
index a81e21c5616..5cb2f41fca9 100755
--- a/src/doc/rustc-dev-guide/ci/install.sh
+++ b/src/doc/rustc-dev-guide/ci/install.sh
@@ -20,5 +20,5 @@ function cargo_install() {
   fi
 }
 
-cargo_install mdbook 0.3.1
-cargo_install mdbook-linkcheck 0.4.0
+cargo_install mdbook 0.3.4
+cargo_install mdbook-linkcheck 0.5.0