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.

Sign up for GitHub

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

Jump to bottom

[beta] Fix link to book repo #41365

Merged
merged 1 commit into from
Apr 20, 2017
Merged

[beta] Fix link to book repo #41365

merged 1 commit into from
Apr 20, 2017

Conversation

steveklabnik
Copy link
Member

This is a backport to beta, to be clear. I don't think we have to take this, but opened this PR to see if we should consider it to save six weeks of breakage.

Due to extracting the book out into its own repo, this link is broken. This fixes it to point to the right place. This was originally filed as rust-lang/book#633.

@rust-highfive
Copy link
Collaborator

r? @brson

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

@rust-highfive
Copy link
Collaborator

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@frewsxcv frewsxcv added the A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools label Apr 19, 2017
@frewsxcv
Copy link
Member

This seems like a good idea to me. Is it okay to r+? Or is there some more process involved since it's a beta merge

@steveklabnik
Copy link
Member Author

Beta stuff gets merged by hand; as sorta "release managers", @brson and or @alexcrichton should make the call and they'll take care of it ❤️

@alexcrichton
Copy link
Member

@bors: r+ p=1

yeah definitely sounds like a good backport!

(p=1 as it's a "backport")

@bors
Copy link
Contributor

bors commented Apr 19, 2017

📌 Commit 1605636 has been approved by alexcrichton

@alexcrichton alexcrichton added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-accepted Accepted for backporting to the compiler in the beta channel. labels Apr 19, 2017
@alexcrichton
Copy link
Member

@steveklabnik is this a backport of a PR to master? (just wondering what to tag beta-accepted)

Also yeah feel free to r+ backports, we still manually bump the beta version number but other than that if a team wants a backport anyone can make a PR and r+ it, no need to wait for me/brson!

@steveklabnik
Copy link
Member Author

steveklabnik commented Apr 19, 2017 •
edited
Loading

@steveklabnik is this a backport of a PR to master? (just wondering what to tag beta-accepted)

yes, that would have been rust-lang/book#564 (since the book is in its own repo, there isn't a matching PR in this one to tag

Also yeah feel free to r+ backports, we still manually bump the beta version number but other than that if a team wants a backport anyone can make a PR and r+ it, no need to wait for me/brson!

Oh right! I forgot we actually use @bors for this now 🎊

@alexcrichton
Copy link
Member

Ok cool no worries, the tags are mostly advisory anyway to track what we need to backport, it's pretty rare to track what we did backport.

@bors
Copy link
Contributor

bors commented Apr 19, 2017

⌛ Testing commit 1605636 with merge 8ba21de...

@bors
Copy link
Contributor

bors commented Apr 19, 2017

💔 Test failed - status-travis

@aidanhs aidanhs mentioned this pull request Apr 19, 2017
Closed
@aidanhs
Copy link
Member

aidanhs commented Apr 19, 2017

This failed because of #41396, a retry won't help at the moment.

@aidanhs aidanhs added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 19, 2017
@alexcrichton
Copy link
Member

@bors: retry

@bors
Copy link
Contributor

bors commented Apr 19, 2017

⌛ Testing commit 1605636 with merge 5b85907...

@aidanhs
Copy link
Member

aidanhs commented Apr 19, 2017

@alexcrichton you were optimistic to think that the fuchsia fix would land on the first try ;) This is going to fail again.

@frewsxcv
Copy link
Member

@bors retry

@frewsxcv frewsxcv changed the title Fix link to book repo [beta] Fix link to book repo Apr 19, 2017
@bors
Copy link
Contributor

bors commented Apr 19, 2017

⌛ Testing commit 1605636 with merge 2a17bb1...

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Apr 19, 2017
@frewsxcv
Rollup merge of rust-lang#41365 - rust-lang:steveklabnik-patch-1, r=a…
e2227a0 
…lexcrichton

[beta] Fix link to book repo

This is a backport to beta, to be clear. I don't think we *have* to take this, but opened this PR to see if we should consider it to save six weeks of breakage.

Due to extracting the book out into its own repo, this link is broken. This fixes it to point to the right place. This was originally filed as rust-lang/book#633.
@frewsxcv frewsxcv mentioned this pull request Apr 19, 2017
Merged
@frewsxcv
Copy link
Member

@bors retry

prioritizing beta rollup

bors added a commit that referenced this pull request Apr 19, 2017
@bors
Auto merge of #41406 - frewsxcv:rollup, r=frewsxcv
e64b987 
[beta] Rollup of 2 pull requests

- Successful merges: #41365, #41397
- Failed merges:
@bors bors merged commit 1605636 into beta Apr 20, 2017
@alexcrichton alexcrichton deleted the steveklabnik-patch-1 branch April 20, 2017 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@brson brson

Labels
A-docs Area: documentation for any part of the project, including the compiler, standard library, and tools S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@steveklabnik @rust-highfive @frewsxcv @alexcrichton @bors @aidanhs @brson