From a10ba12047ad56f916c69b41b9d6673c246e191e Mon Sep 17 00:00:00 2001 From: Who? Me?! Date: Sun, 21 Jun 2020 13:25:43 -0500 Subject: [PATCH] Fix master branch links (#757) * fix links * some debugging * more debugging * fix git checkout in ci * try again * already tests with a merge * Typo Co-authored-by: Tshepang Lekhonkhobe Co-authored-by: Tshepang Lekhonkhobe --- .travis.yml | 2 +- src/SUMMARY.md | 1 + src/building/prerequisites.md | 3 +++ src/getting-started.md | 2 +- 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 src/building/prerequisites.md diff --git a/.travis.yml b/.travis.yml index 58ed7c56..d375fe9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ install: - cargo install mdbook --version 0.3.7 - cargo install mdbook-linkcheck --version 0.5.0 script: -- git rebase origin master # this will exit with an error on conflict +- git log --oneline | head -n 10 - mdbook build notifications: email: diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 4f818fad..c900070a 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -5,6 +5,7 @@ --- - [Part 1: Building, debugging, and contributing to Rustc](./part-1-intro.md) + - [Prerequisites](./building/prerequisites.md) - [Getting Started](./getting-started.md) - [About the compiler team](./compiler-team.md) - [How to Build and Run the Compiler](./building/how-to-build-and-run.md) diff --git a/src/building/prerequisites.md b/src/building/prerequisites.md new file mode 100644 index 00000000..aa13c752 --- /dev/null +++ b/src/building/prerequisites.md @@ -0,0 +1,3 @@ +# Prerequisites + +** Coming Soon: https://github.com/rust-lang/rustc-dev-guide/pull/723 ** diff --git a/src/getting-started.md b/src/getting-started.md index 4cd99720..a848b0b7 100644 --- a/src/getting-started.md +++ b/src/getting-started.md @@ -355,7 +355,7 @@ incredibly helpful: - [Working groups][wg]: there are a bunch of working groups on a wide variety of rust-related things. -[iceb]: ./ice-breaker/cleanup-crew.md +[iceb]: ./notification-groups/cleanup-crew.md [wg]: https://rust-lang.github.io/compiler-team/working-groups/