From 2d8434cec3ac38727b2966faa2b2b1534d5c189b Mon Sep 17 00:00:00 2001 From: Mark Mansi Date: Tue, 5 Nov 2019 11:18:49 -0600 Subject: [PATCH] remove all the hacks, add some improvements --- .travis.yml | 4 ++-- book.toml | 3 ++- ci/build.sh | 10 ---------- ci/install.sh | 4 ++-- 4 files changed, 6 insertions(+), 15 deletions(-) delete mode 100755 ci/build.sh diff --git a/.travis.yml b/.travis.yml index dedec456..50b7d6b9 100644 --- a/.travis.yml +++ b/.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/book.toml b/book.toml index 1d207bf2..b5bced99 100644 --- a/book.toml +++ b/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/ci/build.sh b/ci/build.sh deleted file mode 100755 index 504957b3..00000000 --- a/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/ci/install.sh b/ci/install.sh index a81e21c5..5cb2f41f 100755 --- a/ci/install.sh +++ b/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