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

Add support for release branches in Cargo #3345

Merged
merged 1 commit into from
Nov 30, 2016
Merged

Add support for release branches in Cargo #3345

merged 1 commit into from
Nov 30, 2016

Conversation

alexcrichton
Copy link
Member

Follow the same strategy as the compiler for now in basically every respect:

  • Add new --release-channel configure option, defaulting to dev
  • Remove old --enable-nightly
  • Add --enable-build-openssl as an orthogonal option
  • Hook up Travis/AppVeyor to stable/beta/master branches to do the right
    channel builds.

@rust-highfive
Copy link

r? @brson

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

@alexcrichton alexcrichton mentioned this pull request Nov 29, 2016
Closed
@alexcrichton
Copy link
Member Author

My plan is to, if we want this, land this on master, backport it to freshly created stable/beta branches, get the builds working, then start doing testing to get those builds working.

Afterwards I think we could maybe just change how rust-packaging fetches Cargo to fetch from the new archives instead of the buildbot archives.

@steveklabnik
Copy link
Member

Nice.

It's a minor papercut that cargo reports itself as nightly even when you install rust stable; we get questions on #rust-beginners probably like once a monthish.

@alexcrichton
Copy link
Member Author

Yep! that's fixed here too!

@alexcrichton alexcrichton force-pushed the release-branches branch 3 times, most recently from e3ac076 to 6b034cc Compare November 29, 2016 21:34
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Nov 29, 2016

📌 Commit 6b034cc has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Nov 29, 2016

⌛ Testing commit 6b034cc with merge 821efb0...

@bors
Copy link
Collaborator

bors commented Nov 29, 2016

💔 Test failed - cargo-cross-linux

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

📌 Commit 0d4f7cd has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

⌛ Testing commit 0d4f7cd with merge 7b6f495...

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

📌 Commit 9135f3b has been approved by alexcrichton

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

⌛ Testing commit 9135f3b with merge 7b33cab...

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

⌛ Testing commit 9135f3b with merge b7b925c...

@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

⌛ Testing commit 7a9f908 with merge ed65aa3...

@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

⌛ Testing commit 7a9f908 with merge fe15a29...

@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

⌛ Testing commit 7a9f908 with merge 0a33c8a...

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

💔 Test failed - status-travis

@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Collaborator

bors commented Nov 30, 2016

⌛ Testing commit 7a9f908 with merge 294c7e5...

bors added a commit that referenced this pull request Nov 30, 2016
@bors
Auto merge of #3345 - alexcrichton:release-branches, r=alexcrichton
294c7e5 
Add support for release branches in Cargo

Follow the same strategy as the compiler for now in basically every respect:

* Add new `--release-channel` configure option, defaulting to `dev`
* Remove old `--enable-nightly`
* Add `--enable-build-openssl` as an orthogonal option
* Hook up Travis/AppVeyor to stable/beta/master branches to do the right
  channel builds.
@bors
Copy link
Collaborator

bors commented Nov 30, 2016

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 294c7e5 to master...

@bors bors merged commit 7a9f908 into rust-lang:master Nov 30, 2016
@alexcrichton alexcrichton deleted the release-branches branch November 30, 2016 19:04
@steveklabnik
Copy link
Member

@alexcrichton minor question about this: docs will still be built from nightly, right?

@alexcrichton
Copy link
Member Author

Yes

@steveklabnik
Copy link
Member

Cool. I don't think that's a problem at the moment, as it's the same as we've always had. Just wanted to make sure.

@durka
Copy link
Contributor

durka commented Dec 1, 2016

This seems to have broken the nightlies.

@alexcrichton
Copy link
Member Author

Yeah that was the intention (obsoleting buildbot). We'll have new "nightlies" shortly. A build of Cargo with the fix everyone's waiting for is already available and will go out as soon as rustc has a successful build.

@alexcrichton alexcrichton mentioned this pull request Dec 1, 2016
Merged
bors added a commit that referenced this pull request Dec 2, 2016
@bors
Auto merge of #3353 - alexcrichton:1.14.0-next, r=alexcrichton
8d63784 
Backporting fixes to 1.14.0

This is a backport of the following PRs to fix the actual issue, rust-lang/rust#37969.

* #3311 - first attempt to fix OpenSSL linkage on OSX
* #3315 - second attempt to fix linkage
* #3325 - fix a flaky test causing lots of CI problems
* #3332 - actual fix for OpenSSL linkage on OSX
* #3345 - first PR for automation changes
* #3350 - second PR for automation changes
* #3326 - update git2 to support netbsd
* #3331 - update git2 to fix segfaults in tests
* #3342 - update git2 to fix cert paths
@steveklabnik steveklabnik mentioned this pull request Dec 28, 2016
Merged
@shepmaster shepmaster mentioned this pull request Jan 20, 2017
Merged
@ehuss ehuss added this to the 1.15.0 milestone Feb 6, 2022
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
None yet
Projects
None yet
Milestone
1.15.0
Development

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