diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2018-01-23 10:46:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-23 10:46:59 -0500 |
| commit | 33893a8d5bce0c5ca225c28fc5dfa94900783aad (patch) | |
| tree | 21d208d25bea9acfea381c71aec3344616c7e59b /src/doc/rustc-dev-guide | |
| parent | 7c2f429b2546491a31f4498da314862bbf48dff9 (diff) | |
| parent | 00363d7c56a21967146ffde3e13240dbcc4dde5f (diff) | |
| download | rust-33893a8d5bce0c5ca225c28fc5dfa94900783aad.tar.gz rust-33893a8d5bce0c5ca225c28fc5dfa94900783aad.zip | |
Merge pull request #19 from nikomatsakis/master
invoke `cargo` to install mdbook
Diffstat (limited to 'src/doc/rustc-dev-guide')
| -rw-r--r-- | src/doc/rustc-dev-guide/.travis.yml | 22 | ||||
| -rw-r--r-- | src/doc/rustc-dev-guide/ci/install.sh | 6 |
2 files changed, 16 insertions, 12 deletions
diff --git a/src/doc/rustc-dev-guide/.travis.yml b/src/doc/rustc-dev-guide/.travis.yml index e1fcfa9bf9e..4a2381fa75d 100644 --- a/src/doc/rustc-dev-guide/.travis.yml +++ b/src/doc/rustc-dev-guide/.travis.yml @@ -1,17 +1,17 @@ language: rust - -cache: pip - +cache: +- pip +- cargo install: - - bash ci/install.sh - - source ~/.cargo/env || true - +- source ~/.cargo/env || true +- bash ci/install.sh script: - - true - +- true after_success: - - bash ci/github_pages.sh - +- bash ci/github_pages.sh notifications: email: - on_success: never \ No newline at end of file + on_success: never +env: + global: + secure: EzIPKgJnOk8W0CPK2r6xQv02mV0L2NZJsoWlf3KEHs/ZSskzQEcN18V05/N6H6D4RazRu/UqtWqATV96vZHlmevWkU4PVYz/0UvHfPnu/TbEKBxY/BdJdLIuaNwXVIQ8EnRqVFcRUo/M9xlKk/8mlwVzhPRot8oJQmWDrOqZQgoABFFiU1/OktBz3BtTneR66hqs0rC1tNJyzNh+y2b0qn9Su+N3bp5AXDx5FvDyAKWUfPwP1sRh3xM7oF+0XCnjKKeMYENx7ZltKVQeYSCIHZjBnDIfKX2V1bwKHHrUMrQosJf4lmKsrvdP3sEYUQIIXtY80lA+18yDBhQCKIjh4JyuEisYDMYeYJc2WhUjYaS14WuqnyzRgMMf1EAIwBZgmcsLE2S31csHXXgTWSwwEPzC07erqEsc3nldSQWUbvV9EkFQRXNqMkvyXNt8BQDgSifVw+v0AUBIAr462YlbAN+dk/Ldnd++JPQ6kdrOmegE5B/Ukv+LwFzr9oog2V66TL2STMk8o5ffYWrFGijUfSbMLXIoPRxNj+jFMfAW346tyNCCVKqCexNZV4yUID0f+/zCzcL+DAK1c2hlO4vMQ2fIu2McNKk8RMrMwVsYZhr5jOIvRAkAuaOKZIY+RAsE1VF+G4iGY+UtT89hergHWAdDeFZB+z8OHr1uvaaTQC0= diff --git a/src/doc/rustc-dev-guide/ci/install.sh b/src/doc/rustc-dev-guide/ci/install.sh index d9cb369e548..fac6488b68d 100644 --- a/src/doc/rustc-dev-guide/ci/install.sh +++ b/src/doc/rustc-dev-guide/ci/install.sh @@ -1,6 +1,10 @@ #!/bin/bash set -ex +if command -v mdbook >/dev/null 2>&1; then + cargo install mdbook --vers "0.0.28" +fi + if command -v ghp-import >/dev/null 2>&1; then pip install ghp-import -fi \ No newline at end of file +fi |