diff options
| author | Jorge Aparicio <jorge@japaric.io> | 2019-09-15 19:59:02 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 19:59:02 +0000 |
| commit | 42cac1fc51d6424217e379e93b7974756ba81bc9 (patch) | |
| tree | d5da1cb0f9b3fef2d0a46511889726cdcf556a6d | |
| parent | 7039f6291119db96c330f0f57a90cfc16d91cf04 (diff) | |
| parent | 0f704459c62b8872a80ce371ea23492a5df34e7d (diff) | |
Merge pull request #240 from japaric/faster-docs
faster doc builds and fix redirect on 0.4
| -rw-r--r-- | ci/after-success.sh | 5 | ||||
| -rw-r--r-- | ci/install.sh | 23 |
2 files changed, 16 insertions, 12 deletions
diff --git a/ci/after-success.sh b/ci/after-success.sh index 6deea86..3caf8dc 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 6f8d815..aa70120 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 |