De-dup ci book build

This commit is contained in:
Michael Vines 2018-11-26 17:39:20 -08:00
parent 03ce45d93a
commit af1d9345e0
3 changed files with 32 additions and 26 deletions

30
book/build.sh Executable file
View File

@ -0,0 +1,30 @@
#!/usr/bin/env bash
set -e
cd "$(dirname "$0")"
_() {
echo "--- $*"
"$@"
}
maybe_cargo_install() {
declare cmd=$1
declare crate=$2
if [[ -z $crate ]]; then
crate=$cmd
fi
"$cmd" --help > /dev/null 2>&1
declare exitcode=$?
if [[ $exitcode -ne 0 ]]; then
_ cargo install "$crate"
fi
}
export PATH=$CARGO_HOME/bin:$PATH
maybe_cargo_install mdbook
maybe_cargo_install svgbob svgbob_cli
_ make

View File

@ -20,10 +20,7 @@ maybe_install() {
done done
} }
export PATH=$CARGO_HOME/bin:$PATH book/build.sh
maybe_install mdbook
maybe_install svgbob_cli
_ make -C book
echo --- create book repo echo --- create book repo
( (

View File

@ -12,23 +12,6 @@ _() {
"$@" "$@"
} }
maybe_install() {
declare cmd=$1
declare crate=$2
if [[ -z $crate ]]; then
crate=$cmd
fi
set +e
"$cmd" --help > /dev/null 2>&1
declare exitcode=$?
set -e
if [[ $exitcode -ne 0 ]]; then
_ cargo install "$crate"
fi
}
_ cargo build --all --verbose _ cargo build --all --verbose
_ cargo test --verbose --lib _ cargo test --verbose --lib
@ -49,11 +32,7 @@ for program in programs/native/*; do
) )
done done
# Build the HTML book/build.sh
export PATH=$CARGO_HOME/bin:$PATH
maybe_install mdbook
maybe_install svgbob svgbob_cli
_ make -C book
echo --- ci/localnet-sanity.sh echo --- ci/localnet-sanity.sh
( (