-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
The job Click to expand the log.
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 |
Fixing some things locally, will push updates soon |
Just a heads up, this will likely fail the license check. I think Am I correct that this can't really be used until the print.html issue is solved? |
@ehuss I was not aware of the license check |
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 |
Hey @jamesmunns , thanks for this! I think this is a great step forward. I:
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:
Sound like a plan? Thanks again for working on this; I didn't realize that we could depend on both versions so easily! |
Yea, the license checks are only performed in the AFAIK, it can be run locally using the following steps:
After it's done, don't forget to delete License rules and exceptions are stored in https://github.com/rust-lang/rust/blob/master/src/tools/tidy/src/deps.rs. |
Ah ha, thanks. I wonder if that's something I forgot or something that's changed since last time I delt with this... |
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! |
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. |
Update: I have a patch in (rust-lang/mdBook#866) testing it locally now. |
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. |
@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 🎊 |
Sure! I'll try to get to this in the next 2-3 hours! |
@steveklabnik updated to use the new 0.2.3 release. @ehuss I have also added a license exception for |
Hey @steveklabnik, reping on this for the |
@bors: r+ Thanks so much again! |
📌 Commit f3ac6b3 has been approved by |
…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
The job Click to expand the log.
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 |
Filed issue for spurious failure rust-lang/cargo#6613. |
@bors: retry
… On Jan 29, 2019, at 10:52 PM, Eric Huss ***@***.***> wrote:
Filed issue for spurious failure rust-lang/cargo#6613.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub, or mute the thread.
|
🔒 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
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 Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
38b1d31
to
6395564
Compare
@bors: r+ |
📌 Commit 63955647432472a8ad72cdfb25444ed23ba36076 has been approved by |
The job Click to expand the log.
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 |
6395564
to
f8a9a28
Compare
@bors: r+ |
📌 Commit f8a9a28 has been approved by |
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
☀️ Test successful - checks-travis, status-appveyor |
Only the compatibility items from the embedded book PR. PR with embedded book components: #56291
CC @steveklabnik, @ehuss, and rust-lang/edition-guide#134