From 42b3441f6f2c7f0ae635f9075f930a25edf4297f Mon Sep 17 00:00:00 2001 From: mark Date: Thu, 18 Jun 2020 18:35:52 -0500 Subject: [PATCH 1/7] fix links --- src/SUMMARY.md | 1 + src/building/prerequisites.md | 3 +++ src/getting-started.md | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 src/building/prerequisites.md diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 4f818fadf..c900070a4 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 000000000..9a41d6dd6 --- /dev/null +++ b/src/building/prerequisites.md @@ -0,0 +1,3 @@ +# Prerequesites + +** 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 4cd997200..a848b0b75 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/ From 7493682f2aa0d4eb6c87b55c2fab7f911571d88d Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 19 Jun 2020 16:31:35 -0500 Subject: [PATCH 2/7] some debugging --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 58ed7c562..21a3ec96b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,9 @@ install: - cargo install mdbook-linkcheck --version 0.5.0 script: - git rebase origin master # this will exit with an error on conflict +- git status +- git rev-parse HEAD +- ls -lahR - mdbook build notifications: email: From d0047f61bc16d5e485292b815d40d9fa401a15ce Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 19 Jun 2020 16:37:22 -0500 Subject: [PATCH 3/7] more debugging --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21a3ec96b..728903ac7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,8 @@ install: - cargo install mdbook-linkcheck --version 0.5.0 script: - git rebase origin master # this will exit with an error on conflict -- git status -- git rev-parse HEAD +- git status -vv +- git log --oneline | head -n 10 - ls -lahR - mdbook build notifications: From e19e8ebf2e32ec7ddf656600800ac3a8b656d026 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 19 Jun 2020 16:46:30 -0500 Subject: [PATCH 4/7] fix git checkout in ci --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 728903ac7..171363b76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,10 +14,10 @@ install: - cargo install mdbook --version 0.3.7 - cargo install mdbook-linkcheck --version 0.5.0 script: +- git checkout -b ci - git rebase origin master # this will exit with an error on conflict - git status -vv - git log --oneline | head -n 10 -- ls -lahR - mdbook build notifications: email: From 0c357ed92b25f176a1a96e314e2f209726125e43 Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 19 Jun 2020 16:49:58 -0500 Subject: [PATCH 5/7] try again --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 171363b76..11e01e831 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 checkout -b ci +- git checkout -b ci refs/pull/757/merge - git rebase origin master # this will exit with an error on conflict - git status -vv - git log --oneline | head -n 10 From b7437befdea55d93971d8eac6f34adde7793151e Mon Sep 17 00:00:00 2001 From: mark Date: Fri, 19 Jun 2020 16:54:55 -0500 Subject: [PATCH 6/7] already tests with a merge --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 11e01e831..d375fe9d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,6 @@ install: - cargo install mdbook --version 0.3.7 - cargo install mdbook-linkcheck --version 0.5.0 script: -- git checkout -b ci refs/pull/757/merge -- git rebase origin master # this will exit with an error on conflict -- git status -vv - git log --oneline | head -n 10 - mdbook build notifications: From ad91eedf6e28aadd2f1ed50d170ae15e1f450864 Mon Sep 17 00:00:00 2001 From: Who? Me?! Date: Sun, 21 Jun 2020 08:32:39 -0500 Subject: [PATCH 7/7] Typo Co-authored-by: Tshepang Lekhonkhobe --- src/building/prerequisites.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/building/prerequisites.md b/src/building/prerequisites.md index 9a41d6dd6..aa13c7524 100644 --- a/src/building/prerequisites.md +++ b/src/building/prerequisites.md @@ -1,3 +1,3 @@ -# Prerequesites +# Prerequisites ** Coming Soon: https://github.com/rust-lang/rustc-dev-guide/pull/723 **