aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ci/after-success.sh5
-rw-r--r--ci/install.sh23
2 files changed, 16 insertions, 12 deletions
diff --git a/ci/after-success.sh b/ci/after-success.sh
index 6deea868..3caf8dc5 100644
--- a/ci/after-success.sh
+++ b/ci/after-success.sh
@@ -21,6 +21,7 @@ main() {
cp LICENSE-* $td/book/$lang/
done
+ local root=$(pwd)
# build older docs
for ver in ${vers[@]}; do
local prefix=${ver%.*}
@@ -32,13 +33,13 @@ main() {
pushd $src
cargo doc || cargo doc --features timer-queue
cp -r target/doc $td/$prefix/api
- sed 's|URL|rtfm/index.html|g' redirect.html > $td/$prefix/api/index.html
+ sed 's|URL|rtfm/index.html|g' $root/redirect.html > $td/$prefix/api/index.html
for lang in ${langs[@]}; do
( cd book/$lang && mdbook build )
cp -r book/$lang/book $td/$prefix/book/$lang
cp LICENSE-* $td/$prefix/book/$lang/
done
- sed 's|URL|book/en|g' redirect.html > $td/$prefix/index.html
+ sed 's|URL|book/en|g' $root/redirect.html > $td/$prefix/index.html
popd
rm -rf $src
diff --git a/ci/install.sh b/ci/install.sh
index 6f8d8151..aa701205 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -1,22 +1,25 @@
set -euxo pipefail
main() {
- if [ $TARGET = x86_64-unknown-linux-gnu ]; then
- ( cd .. && cargo install microamp-tools --version 0.1.0-alpha.2 -f )
- rustup target add thumbv6m-none-eabi thumbv7m-none-eabi
- fi
+ # these are not needed for doc builds
+ if [ $TRAVIS_BRANCH != master ] || [ $TRAVIS_PULL_REQUEST != false ]; then
+ if [ $TARGET = x86_64-unknown-linux-gnu ]; then
+ ( cd .. && cargo install microamp-tools --version 0.1.0-alpha.3 -f )
+ rustup target add thumbv6m-none-eabi thumbv7m-none-eabi
+ fi
+
+ rustup target add $TARGET
- rustup target add $TARGET
+ mkdir qemu
+ curl -L https://github.com/japaric/qemu-bin/raw/master/14.04/qemu-system-arm-2.12.0 > qemu/qemu-system-arm
+ chmod +x qemu/qemu-system-arm
- mkdir qemu
- curl -L https://github.com/japaric/qemu-bin/raw/master/14.04/qemu-system-arm-2.12.0 > qemu/qemu-system-arm
- chmod +x qemu/qemu-system-arm
+ pip install linkchecker --user
+ fi
# install mdbook
curl -LSfs https://japaric.github.io/trust/install.sh | \
sh -s -- --git rust-lang-nursery/mdbook --tag v0.3.1
-
- pip install linkchecker --user
}
main