From db0306a6d26997802de2fb144226b7ba6da2b32a Mon Sep 17 00:00:00 2001 From: Mathieu David Date: Mon, 1 Aug 2016 21:26:23 +0200 Subject: [PATCH] Fix bug in shell script that was preventing deployment of the docs to gh-pages --- .travis.yml | 9 +++++---- deploy.sh | 6 +++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 52265f8b8f..4a4c84d1a1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,7 @@ language: generic env: global: - PROJECT_NAME=mdBook + - secure: l3/qEC4krRerllLQzni8j5AjngFi6pluWvBWj//1mJLoIEYwxlQ9mYxEdd9BqccWWFn3K0bVYCVC/64+tP6sRfLkZCe2gPUtwe7ITwCDbapUxmkiRObVJCs5yMQZt6idyhHUDKAXKgNCrusfI2BM3tKGBfRK7Cnn/R/7p/U9+q7D1sgJtUKp6ypVzK6A3jLNp3dFLFI19a5KmbZMVsaa7tOhtdDJjjr7ebsc9z7HMW5/OItiWU3FSauVQQlUMaCiEgFuIG7H7OnBAYWB/gNEtLuwfLqU9UjtWk/njNNRnmJ7m3y5HbQhv5H5F5mJUOq9XFlPLwPwyTeVztSGdQm6k8Pp2pgKBUjY27afBl9BWU+msmN6k0oXfhvIebiBPe/x2udiKeFik1xqOOEU1q9dF0sZiuPxCSM1n7tgWklJ8epgaRQaMPPQw9pO/2H5/ynHCJqBlw6WcdiqWtwAyyr/GEx62u/cg5IVkqb7KLmYsWzjS8wYG4CYs1eIxCw2xPZxP0FGuUXvxTBUPipFze6Z7FqxVauXtVe2D7c1P4738HZP660rmR0GYtHtKLny1QxCCK9sxd9JmcezFCSz4YeQ1od9xc0OzGJ2ullKNGizmGfYmgL6X8faNylLIEdaiHAcY16xV3L0g3fXL1Qg360UHQyj7GIv+0nqQnf+H9xRTTU= matrix: include: @@ -68,10 +69,10 @@ script: - bash ci/script.sh after_success: - - test $TRAVIS_PULL_REQUEST == "false" && - test $TRAVIS_BRANCH == "master" && - test $TARGET == "x86_64-unknown-linux-gnu" && - test $TRAVIS_RUST_VERSION = "stable" && + - test "$TRAVIS_PULL_REQUEST" == "false" && + test "$TRAVIS_BRANCH" == "master" && + test "$TARGET" == "x86_64-unknown-linux-gnu" && + test "$CHANNEL" = "stable" && npm install stylus nib && bash deploy.sh diff --git a/deploy.sh b/deploy.sh index 1f8237f9e2..84c5fb36d4 100644 --- a/deploy.sh +++ b/deploy.sh @@ -15,13 +15,13 @@ cargo doc echo -e "${CYAN}Running mdbook build${NC}" # Run mdbook to generate the book -target/$TARGET/debug/mdbook build book-example/ +target/"$TARGET"/debug/mdbook build book-example/ echo -e "${CYAN}Copying book to target/doc${NC}" # Copy files from rendered book to doc root -cp -R book-example/book/* target/$TARGET/doc/ +cp -R book-example/book/* target/doc/ -cd target/$TARGET/doc +cd target/doc echo -e "${CYAN}Initializing Git${NC}" git init