-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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
Add support for release branches in Cargo #3345
Conversation
r? @brson (rust_highfive has picked a reviewer for you, use r? to override) |
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 |
f2257e8
to
40be712
Compare
Nice. It's a minor papercut that cargo reports itself as |
40be712
to
0313202
Compare
Yep! that's fixed here too! |
e3ac076
to
6b034cc
Compare
@bors: r+ |
📌 Commit 6b034cc has been approved by |
⌛ Testing commit 6b034cc with merge 821efb0... |
💔 Test failed - cargo-cross-linux |
6b034cc
to
0d4f7cd
Compare
@bors: r+ |
📌 Commit 0d4f7cd has been approved by |
⌛ Testing commit 0d4f7cd with merge 7b6f495... |
0d4f7cd
to
9135f3b
Compare
@bors: r+ |
📌 Commit 9135f3b has been approved by |
⌛ Testing commit 9135f3b with merge 7b33cab... |
💔 Test failed - status-appveyor |
@bors: retry |
⌛ Testing commit 9135f3b with merge b7b925c... |
@bors: retry |
⌛ Testing commit 7a9f908 with merge ed65aa3... |
@bors: retry |
⌛ Testing commit 7a9f908 with merge fe15a29... |
@bors: retry |
⌛ Testing commit 7a9f908 with merge 0a33c8a... |
💔 Test failed - status-travis |
@bors: retry |
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.
☀️ Test successful - status-appveyor, status-travis |
@alexcrichton minor question about this: docs will still be built from nightly, right? |
Yes |
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. |
This seems to have broken the nightlies. |
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. |
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
Follow the same strategy as the compiler for now in basically every respect:
--release-channel
configure option, defaulting todev
--enable-nightly
--enable-build-openssl
as an orthogonal optionchannel builds.