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
This commit is contained in:
Amanjeev Sethi 2019-10-02 15:36:42 -04:00 committed by Who? Me?!
parent 6b4949034b
commit a6e1c86d8b
3 changed files with 18 additions and 30 deletions

View File

@ -12,7 +12,7 @@ install:
- source ~/.cargo/env || true
- bash -x ci/install.sh
script:
- bash -x ci/build-ignore-timeouts.sh
- bash -x ci/build.sh
- mdbook test
notifications:
email:

View File

@ -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

17
ci/build.sh Executable file
View File

@ -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