Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support multiple versions of MdBook for docs #57495

Merged
merged 5 commits into from
Jan 30, 2019

Conversation

jamesmunns
Copy link
Member

@jamesmunns jamesmunns commented Jan 10, 2019

Only the compatibility items from the embedded book PR. PR with embedded book components: #56291

CC @steveklabnik, @ehuss, and rust-lang/edition-guide#134

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 10, 2019
@jamesmunns jamesmunns changed the title Only the compatibility items from the embedded book PR Support multiple versions of MdBook for docs Jan 10, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:13daa8e1:start=1547149245340135286,finish=1547149248225762036,duration=2885626750
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
[00:01:38] downloading https://static.rust-lang.org/dist/2019-01-04/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:39] 
######################################################################## 100.0%
[00:01:39] extracting /checkout/obj/build/cache/2019-01-04/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:01:39] warning: /checkout/src/tools/rustbook/Cargo.toml: the cargo feature `rename-dependency` is now stable and is no longer necessary to be listed in the manifest
[00:01:39]     Updating crates.io index
[00:01:48] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:48] Build completed unsuccessfully in 0:00:22
[00:01:48] Makefile:71: recipe for target 'prepare' failed
[00:01:48] make: *** [prepare] Error 1
[00:01:49] Command failed. Attempt 2/5:
[00:01:49] Command failed. Attempt 2/5:
[00:01:49] warning: /checkout/src/tools/rustbook/Cargo.toml: the cargo feature `rename-dependency` is now stable and is no longer necessary to be listed in the manifest
[00:01:49] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:49] Build completed unsuccessfully in 0:00:00
[00:01:49] Makefile:71: recipe for target 'prepare' failed
[00:01:49] make: *** [prepare] Error 1
[00:01:51] Command failed. Attempt 3/5:
[00:01:51] Command failed. Attempt 3/5:
[00:01:51] warning: /checkout/src/tools/rustbook/Cargo.toml: the cargo feature `rename-dependency` is now stable and is no longer necessary to be listed in the manifest
[00:01:52] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:52] Build completed unsuccessfully in 0:00:00
[00:01:52] make: *** [prepare] Error 1
[00:01:52] Makefile:71: recipe for target 'prepare' failed
[00:01:55] Command failed. Attempt 4/5:
[00:01:55] Command failed. Attempt 4/5:
[00:01:55] warning: /checkout/src/tools/rustbook/Cargo.toml: the cargo feature `rename-dependency` is now stable and is no longer necessary to be listed in the manifest
[00:01:55] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:55] Build completed unsuccessfully in 0:00:00
[00:01:55] make: *** [prepare] Error 1
[00:01:55] Makefile:71: recipe for target 'prepare' failed
[00:01:59] Command failed. Attempt 5/5:
[00:01:59] Command failed. Attempt 5/5:
[00:01:59] warning: /checkout/src/tools/rustbook/Cargo.toml: the cargo feature `rename-dependency` is now stable and is no longer necessary to be listed in the manifest
[00:01:59] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:01:59] Build completed unsuccessfully in 0:00:00
[00:01:59] make: *** [prepare] Error 1
[00:01:59] Makefile:71: recipe for target 'prepare' failed
[00:01:59] The command has failed after 5 attempts.
---
travis_time:end:091de74f:start=1547149382103166182,finish=1547149382108608360,duration=5442178
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2912f45c
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:20e4d594
travis_time:start:20e4d594
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:100d9a48
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@jamesmunns
Copy link
Member Author

Fixing some things locally, will push updates soon

@alexcrichton
Copy link
Member

r? @steveklabnik

@ehuss
Copy link
Contributor

ehuss commented Jan 10, 2019

Just a heads up, this will likely fail the license check. I think arrayref will need to be added to the exception list. I'm pretty sure the other dependencies will be ok, but I'm not certain.

Am I correct that this can't really be used until the print.html issue is solved?

@jamesmunns
Copy link
Member Author

@ehuss I was not aware of the license check

@jamesmunns
Copy link
Member Author

This may work for you, depending on how you are doing links. It does not work for the style the embedded-book uses, but I am not sure if your changes will have an issue.

You could rebase your changes on this PR, and try running python x.py test src/tools/linkchecker?

@steveklabnik
Copy link
Member

Hey @jamesmunns , thanks for this! I think this is a great step forward.

I:

  • built your PR locally
  • wrote a new book in tree with two pages, linking to each other
  • built with mdbook1 and watched the linkcheck fail
  • built with mdbook2 and watched only print.html fail

I'm not sure about the license check mention, given that travis passed here. @ehuss could you say more about the problem you see here?

Given that both of us are still running into rust-lang/mdBook#828, here's what I'd like to propose:

  1. I'm going to look into the print.html issue now
  2. we let this PR sit over the weekend, I highly doubt that I'll have a bugfix ready in the remaining time I have today
  3. Hopefully on Monday i'll have a patch and we can put out a new mdbook release, update this PR to include it, and then merge.

Sound like a plan?

Thanks again for working on this; I didn't realize that we could depend on both versions so easily!

@ehuss
Copy link
Contributor

ehuss commented Jan 11, 2019

I'm not sure about the license check mention, given that travis passed here. @ehuss could you say more about the problem you see here?

Yea, the license checks are only performed in the distcheck builder, which is not run on PRs. I've wondered in the past if it might be possible to run a reduced job on PRs that only did license checks, but I'm not sure if distcheck is too different to get an accurate result quickly (distcheck requires generating a release tarball, extracting it, yadda yadda). It's a pain because nobody knows about the problem until bors tries to merge.

AFAIK, it can be run locally using the following steps:

  1. Run cargo vendor
  2. Edit config.toml and set vendor to true.
  3. ./x.py test tidy

After it's done, don't forget to delete .cargo/config and unset vendor and maybe delete the vendor directory.

License rules and exceptions are stored in https://github.com/rust-lang/rust/blob/master/src/tools/tidy/src/deps.rs.

@steveklabnik
Copy link
Member

Ah ha, thanks. I wonder if that's something I forgot or something that's changed since last time I delt with this...

@jamesmunns
Copy link
Member Author

Hey @steveklabnik, I didn't see this (my inbox is a mess right now), but your plan sounds good! I'll be available during Berlin business hours this week as well if I can help with anything.

If you are able to fix the print.html issues, I can also get the embedded book PR fixed up ASAP!

@steveklabnik
Copy link
Member

It's all good!

So, between Friday and this morning, I think I've found the culprit. Bad news is, I'm not sure the fix will be easy. I'll fill in more details on the mdbook issue.

@steveklabnik
Copy link
Member

Update: I have a patch in (rust-lang/mdBook#866) testing it locally now.

@steveklabnik
Copy link
Member

Good news! Not only has my local test been successful, but I applied #56291 on top of it as well, and the tests seem to pass!

Next steps are to get rust-lang/mdBook#866 reviewed, a release cut, and update this PR to use it.

Thank you again for sticking through this, it's been a journey but I'm really excited about it. This "two versions of mdbook" strategy is going to work out much more nicely than my initial "oh god do the work of updating all of the books at the same time" thing I thought I had to do.

@steveklabnik
Copy link
Member

@jamesmunns I have released mdbook 0.2.3 with the fix; can you update this PR to use that version, and then we can merge 🎊

@jamesmunns
Copy link
Member Author

Sure! I'll try to get to this in the next 2-3 hours!

@jamesmunns
Copy link
Member Author

@steveklabnik updated to use the new 0.2.3 release. @ehuss I have also added a license exception for arrayref.

@jamesmunns
Copy link
Member Author

Hey @steveklabnik, reping on this for the r+ :)

@steveklabnik
Copy link
Member

@bors: r+

Thanks so much again!

@bors
Copy link
Contributor

bors commented Jan 21, 2019

📌 Commit f3ac6b3 has been approved by steveklabnik

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 21, 2019
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jan 21, 2019
…abnik

Support multiple versions of MdBook for docs

Only the compatibility items from the embedded book PR. PR with embedded book components: rust-lang#56291

CC @steveklabnik, @ehuss, and rust-lang/edition-guide#134
@bors bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 30, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-aux of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
[01:16:20] travis_time:end:stage0-rustbook:start=1548817629355330815,finish=1548817903128895448,duration=273773564633

[01:16:20] [TIMING] ToolBuild { compiler: Compiler { stage: 0, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu", tool: "rustbook", path: "src/tools/rustbook", mode: ToolBootstrap, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 273.774
[01:16:20] Rustbook (x86_64-unknown-linux-gnu) - unstable-book
[01:16:22] [TIMING] RustbookSrc { target: "x86_64-unknown-linux-gnu", name: "unstable-book", src: "/checkout/obj/build/x86_64-unknown-linux-gnu/md-doc", version: MdBook1 } -- 1.527
[01:16:22] Rustbook (x86_64-unknown-linux-gnu) - book
[01:16:24] [TIMING] RustbookSrc { target: "x86_64-unknown-linux-gnu", name: "book", src: "/checkout/src/doc", version: MdBook1 } -- 1.665
[01:16:24] Rustbook (x86_64-unknown-linux-gnu) - book/first-edition
[01:16:24] [TIMING] RustbookSrc { target: "x86_64-unknown-linux-gnu", name: "book/first-edition", src: "/checkout/src/doc", version: MdBook1 } -- 0.118
[01:16:24] Rustbook (x86_64-unknown-linux-gnu) - book/second-edition
[01:16:24] [TIMING] RustbookSrc { target: "x86_64-unknown-linux-gnu", name: "book/second-edition", src: "/checkout/src/doc", version: MdBook1 } -- 0.248
[01:16:24] Rustbook (x86_64-unknown-linux-gnu) - book/2018-edition
[01:16:24] [TIMING] RustbookSrc { target: "x86_64-unknown-linux-gnu", name: "book/2018-edition", src: "/checkout/src/doc", version: MdBook1 } -- 0.255
[01:16:24] Uplifting stage1 test (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:16:24] Copying stage2 test from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
[01:16:24] Uplifting stage1 rustc (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:16:24] Copying stage2 rustc from stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu / x86_64-unknown-linux-gnu)
---
[01:17:53] travis_time:end:stage2-error_index_generator:start=1548817990941982524,finish=1548817995513648429,duration=4571665905

[01:17:53] [TIMING] ToolBuild { compiler: Compiler { stage: 2, host: "x86_64-unknown-linux-gnu" }, target: "x86_64-unknown-linux-gnu", tool: "error_index_generator", path: "src/tools/error_index_generator", mode: ToolRustc, is_optional_tool: false, source_type: InTree, extra_features: [] } -- 4.573
[01:17:53] Rustbook (x86_64-unknown-linux-gnu) - nomicon
[01:17:53] [TIMING] RustbookSrc { target: "x86_64-unknown-linux-gnu", name: "nomicon", src: "/checkout/src/doc", version: MdBook1 } -- 0.416
[01:17:53] Rustbook (x86_64-unknown-linux-gnu) - reference
[01:17:54] [TIMING] RustbookSrc { target: "x86_64-unknown-linux-gnu", name: "reference", src: "/checkout/src/doc", version: MdBook1 } -- 0.731
[01:17:54] Rustbook (x86_64-unknown-linux-gnu) - rust-by-example
[01:17:54] Rustbook (x86_64-unknown-linux-gnu) - rust-by-example
[01:17:55] [TIMING] RustbookSrc { target: "x86_64-unknown-linux-gnu", name: "rust-by-example", src: "/checkout/src/doc", version: MdBook1 } -- 0.973
[01:17:55] Rustbook (x86_64-unknown-linux-gnu) - rustc
[01:17:55] [TIMING] RustbookSrc { target: "x86_64-unknown-linux-gnu", name: "rustc", src: "/checkout/src/doc", version: MdBook1 } -- 0.117
[01:17:56] [TIMING] CargoBook { target: "x86_64-unknown-linux-gnu", name: "cargo" } -- 0.498
[01:17:56] Rustbook (x86_64-unknown-linux-gnu) - edition-guide
[01:17:56] Rustbook (x86_64-unknown-linux-gnu) - edition-guide
[01:17:56] [TIMING] RustbookSrc { target: "x86_64-unknown-linux-gnu", name: "edition-guide", src: "/checkout/src/doc", version: MdBook1 } -- 0.319
[01:17:56] travis_fold:end:make-all

[01:17:56] travis_time:end:0d15e098:start=1548813560597245775,finish=1548817998757107627,duration=4438159861852
travis_fold:start:make-check-aux
---
[01:47:40] test workspaces::ws_warn_unused ... ok
[01:47:40] 
[01:47:40] failures:
[01:47:40] 
[01:47:40] ---- support::resolver::meta_test_multiple_versions_strategy stdout ----
[01:47:40] thread 'support::resolver::meta_test_multiple_versions_strategy' panicked at 'In 1280 tries we did not see a wide enough distribution of multiple versions of the same library! dis: [1026, 75, 30, 24, 14, 5, 4, 7, 0, 19]', src/tools/cargo/tests/testsuite/support/resolver.rs:564:5
[01:47:40] 
[01:47:40] failures:
[01:47:40]     support::resolver::meta_test_multiple_versions_strategy
[01:47:40] 
---
[01:47:40] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "-j" "4" "--release" "--locked" "--color" "always" "--manifest-path" "/checkout/src/tools/cargo/Cargo.toml" "--features" "rustc-workspace-hack/all-static"
[01:47:40] expected success, got: exit code: 101
[01:47:40] 
[01:47:40] 
[01:47:41] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test src/test/pretty src/test/run-pass/pretty src/test/run-fail/pretty src/test/run-pass-valgrind/pretty src/test/run-pass-fulldeps/pretty src/tools/cargo src/tools/cargotest
[01:47:41] Build completed unsuccessfully in 0:29:44
[01:47:41] Makefile:50: recipe for target 'check-aux' failed
[01:47:41] make: *** [check-aux] Error 1
The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:2e909868
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
Wed Jan 30 03:43:04 UTC 2019
---
travis_time:end:18fc4ab2:start=1548819786966754413,finish=1548819786982287088,duration=15532675
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:068993e0
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:start:crashlog
obj/cores/core.3676.!checkout!obj!build!x86_64-unknown-linux-gnu!stage2!bin!rustc
[New LWP 3682]
[New LWP 3676]
warning: Could not load shared library symbols for 8 libraries, e.g. /lib/x86_64-linux-gnu/libc.so.6.
Use the "info sharedlibrary" command to see the complete listing.
Do you need "set solib-search-path" or "set sysroot"?
Core was generated by `rustc --crate-name foo src/lib.rs --color never --crate-type lib --emit=dep-inf'.
Program terminated with signal SIGABRT, Aborted.
#0  0x00007f97aceca428 in ?? ()
[Current thread is 1 (LWP 3682)]
#0  0x00007f97aceca428 in ?? ()
#1  0x00007f97acecc02a in ?? ()
#2  0x0000000000000020 in ?? ()
#3  0x0000000000000000 in ?? ()
travis_time:end:068993e0:start=1548819786999772370,finish=1548819788889499876,duration=1889727506
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0165404f
travis_time:start:0165404f
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:1ae32050
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 30, 2019
@ehuss
Copy link
Contributor

ehuss commented Jan 30, 2019

Filed issue for spurious failure rust-lang/cargo#6613.

@steveklabnik
Copy link
Member

steveklabnik commented Jan 30, 2019 via email

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 30, 2019
@bors
Copy link
Contributor

bors commented Jan 30, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout mdbook-compat (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self mdbook-compat --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 30, 2019
@steveklabnik
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 30, 2019

📌 Commit 63955647432472a8ad72cdfb25444ed23ba36076 has been approved by steveklabnik

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 30, 2019
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-6.0 of your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
travis_time:end:107e0c8f:start=1548857949567891921,finish=1548857951891384833,duration=2323492912
$ git checkout -qf FETCH_HEAD
travis_fold:end:git.checkout

Encrypted environment variables have been removed for security reasons.
See https://docs.travis-ci.com/user/pull-requests/#pull-requests-and-security-restrictions
$ export SCCACHE_BUCKET=rust-lang-ci-sccache2
$ export SCCACHE_REGION=us-west-1
Setting environment variables from .travis.yml
$ export IMAGE=x86_64-gnu-llvm-6.0
---
###################################################################       94.0%
######################################################################## 100.0%
[00:02:14] extracting /checkout/obj/build/cache/2019-01-18/cargo-beta-x86_64-unknown-linux-gnu.tar.gz
[00:02:14]     Updating crates.io index
[00:02:27] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:27] Build completed unsuccessfully in 0:00:56
[00:02:27] Makefile:70: recipe for target 'prepare' failed
[00:02:27] make: *** [prepare] Error 1
[00:02:28] Command failed. Attempt 2/5:
[00:02:28] Command failed. Attempt 2/5:
[00:02:28]     Updating crates.io index
[00:02:29] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:29] Build completed unsuccessfully in 0:00:00
[00:02:29] Makefile:70: recipe for target 'prepare' failed
[00:02:29] make: *** [prepare] Error 1
[00:02:31] Command failed. Attempt 3/5:
[00:02:31] Command failed. Attempt 3/5:
[00:02:31]     Updating crates.io index
[00:02:31] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:31] Build completed unsuccessfully in 0:00:00
[00:02:31] Makefile:70: recipe for target 'prepare' failed
[00:02:31] make: *** [prepare] Error 1
[00:02:34] Command failed. Attempt 4/5:
[00:02:34] Command failed. Attempt 4/5:
[00:02:34]     Updating crates.io index
[00:02:35] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:35] Build completed unsuccessfully in 0:00:00
[00:02:35] make: *** [prepare] Error 1
[00:02:35] Makefile:70: recipe for target 'prepare' failed
[00:02:39] Command failed. Attempt 5/5:
[00:02:39] Command failed. Attempt 5/5:
[00:02:39]     Updating crates.io index
[00:02:40] error: the lock file /checkout/Cargo.lock needs to be updated but --locked was passed to prevent this
[00:02:40] Build completed unsuccessfully in 0:00:01
[00:02:40] make: *** [prepare] Error 1
[00:02:40] Makefile:70: recipe for target 'prepare' failed
[00:02:40] The command has failed after 5 attempts.
---
travis_time:end:005eb731:start=1548858125348140699,finish=1548858125352846451,duration=4705752
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:2ffea581
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:06b82e85
travis_time:start:06b82e85
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0990c258
$ dmesg | grep -i kill

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@steveklabnik
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jan 30, 2019

📌 Commit f8a9a28 has been approved by steveklabnik

@bors
Copy link
Contributor

bors commented Jan 30, 2019

⌛ Testing commit f8a9a28 with merge d9a2e3b...

bors added a commit that referenced this pull request Jan 30, 2019
Support multiple versions of MdBook for docs

Only the compatibility items from the embedded book PR. PR with embedded book components: #56291

CC @steveklabnik, @ehuss, and rust-lang/edition-guide#134
@bors
Copy link
Contributor

bors commented Jan 30, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: steveklabnik
Pushing d9a2e3b to master...

@bors bors merged commit f8a9a28 into rust-lang:master Jan 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants