Fix (build CI script):

* Removes timeout hack because it is not needed because we have upgraded mdbook_linkcheck
* Renamed build script because it is no longer ignoring timeouts

2 files changed, 17 insertions, 29 deletions

diff --git a/src/doc/rustc-dev-guide/ci/build-ignore-timeouts.sh b/src/doc/rustc-dev-guide/ci/build-ignore-timeouts.sh
deleted file mode 100755
index 3ec81f6245f..00000000000
--- a/src/doc/rustc-dev-guide/ci/build-ignore-timeouts.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash -x
-
-output=$(mktemp)
-
-mkdir -p book/
-cp -r $HOME/linkcheck/ book/
-RUST_LOG=mdbook_linkcheck=debug mdbook-linkcheck -s 2>&1 | tee -a $output
-cp -r book/linkcheck $HOME/
-
-mdbook build
-
-result=${PIPESTATUS[0]}
-
-# if passed, great!
-if [ "$result" -eq "0" ] ; then
-    exit 0 ;
-fi
-
-errors=$(cat $output | sed -n 's/There \(was\|were\) \([0-9]\+\).*$/\2/p')
-timeouts=$(cat $output | grep "error while fetching" | wc -l)
-
-# if all errors are timeouts, ignore them...
-if [ "$errors" -eq "$timeouts" ] ; then
-    echo "Ignoring $timeouts timeouts";
-    exit 0;
-else
-    echo "Non-timeout errors found";
-    exit 1;
-fi
diff --git a/src/doc/rustc-dev-guide/ci/build.sh b/src/doc/rustc-dev-guide/ci/build.sh
new file mode 100755
index 00000000000..b0fae1240b1
--- /dev/null
+++ b/src/doc/rustc-dev-guide/ci/build.sh
@@ -0,0 +1,17 @@
+#!/bin/bash -x
+
+output=$(mktemp)
+
+mkdir -p book/
+cp -r $HOME/linkcheck/ book/
+RUST_LOG=mdbook_linkcheck=debug mdbook-linkcheck -s 2>&1 | tee -a $output
+cp -r book/linkcheck $HOME/
+
+mdbook build
+
+result=${PIPESTATUS[0]}
+
+# if passed, great!
+if [ "$result" -eq "0" ] ; then
+    exit 0 ;
+fi