From 2a9a53c610e8753c4ed53e1e9cde844c46086ecd Mon Sep 17 00:00:00 2001 From: mark Date: Wed, 10 Jun 2020 16:01:36 -0500 Subject: [PATCH 1/3] Fix CI rebase --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3e5febe30..690c906f6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,9 @@ install: - cargo install mdbook --version 0.3.7 - cargo install mdbook-linkcheck --version 0.5.0 script: -- git rebase master # this will exit with an error on conflict +- git remote add rdg https://github.com/rust-lang/rustc-dev-guide.git +- git fetch rdg +- git rebase rdg master # this will exit with an error on conflict - mdbook build notifications: email: From 473b8866ce992a2f36e6916a86352ec421f6c2f1 Mon Sep 17 00:00:00 2001 From: Who? Me?! Date: Wed, 10 Jun 2020 16:10:58 -0500 Subject: [PATCH 2/3] attempt 2 --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 690c906f6..09cf8fc8a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,9 +14,9 @@ install: - cargo install mdbook --version 0.3.7 - cargo install mdbook-linkcheck --version 0.5.0 script: -- git remote add rdg https://github.com/rust-lang/rustc-dev-guide.git -- git fetch rdg -- git rebase rdg master # this will exit with an error on conflict +- git remote -vvv +- git fetch origin +- git rebase origin master # this will exit with an error on conflict - mdbook build notifications: email: From c6282fe4d03445785ebcedc4c923c9ebc56defdf Mon Sep 17 00:00:00 2001 From: Who? Me?! Date: Wed, 10 Jun 2020 16:13:49 -0500 Subject: [PATCH 3/3] cleanup --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09cf8fc8a..6df0f9a44 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,8 +14,6 @@ install: - cargo install mdbook --version 0.3.7 - cargo install mdbook-linkcheck --version 0.5.0 script: -- git remote -vvv -- git fetch origin - git rebase origin master # this will exit with an error on conflict - mdbook build notifications: