From f48a68e481e2ce8eaf90f6471200569030102f3a Mon Sep 17 00:00:00 2001 From: Michael Bryan Date: Sat, 27 Jan 2018 14:41:40 +0800 Subject: Removed ghp-import and run mdbook build unconditionally --- src/doc/rustc-dev-guide/ci/github_pages.sh | 11 ----------- src/doc/rustc-dev-guide/ci/install.sh | 7 ------- 2 files changed, 18 deletions(-) delete mode 100644 src/doc/rustc-dev-guide/ci/github_pages.sh (limited to 'src/doc/rustc-dev-guide/ci') diff --git a/src/doc/rustc-dev-guide/ci/github_pages.sh b/src/doc/rustc-dev-guide/ci/github_pages.sh deleted file mode 100644 index ffd89ad5227..00000000000 --- a/src/doc/rustc-dev-guide/ci/github_pages.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -set -ex - -BOOK_DIR=book - -# Only upload the built book to github pages if it's a commit to master -if [ "$TRAVIS_BRANCH" = master -a "$TRAVIS_PULL_REQUEST" = false ]; then - mdbook build -else - echo Skipping 'mdbook build' because this is not master or this is just a PR. -fi diff --git a/src/doc/rustc-dev-guide/ci/install.sh b/src/doc/rustc-dev-guide/ci/install.sh index 81cbd8fb72d..99c85986cbb 100644 --- a/src/doc/rustc-dev-guide/ci/install.sh +++ b/src/doc/rustc-dev-guide/ci/install.sh @@ -15,10 +15,3 @@ function cargo_install() { cargo_install mdbook 0.1.1 cargo_install mdbook-linkcheck 0.1.0 - -if command -v ghp-import >/dev/null 2>&1; then - echo "ghp-import already installed at $(which ghp-import)" -else - echo "installing ghp-import" - pip install --user ghp-import -fi -- cgit 1.4.1-3-g733a5