-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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 Redox Dockerfile and Travis Environment #43303
Conversation
(rust_highfive has picked a reviewer for you, use r? to override) |
As noted in the referenced issue, this likely won't be merged imminently if only because we're at the builder capacity. That said, there is a |
@aidanhs You could disable another platform. Might I suggest |
I'm against removing anything from Tier 2 support that's there already today: "Official binary releases are provided for the platform." is the guarantee on the forge, and I think that implies that we'll continue producing those. I've heard that we expect to increase the quantity of available builders soon (though I don't know of a specific timeframe) which would allow us to add redox easily. |
@Mark-Simulacrum I have resources to build this, is it possible to share them with you? |
@jackpot51 previously builders have been added in an ad-hoc manner effectively up to the limit of current funding. At that point there was a realisation that a more sustainable model needs developing, which is what @aturon was talking about in the linked issue. While this was in progress, we have had to postpone other targets like #41133 and #41149 - this is a known ongoing problem! My interpretation of what @aturon was saying in the linked issue is that new builders will arrive at some point and it would probably be more reasonable to talk about adding redox as a builder then. Until that point, we probably want to avoid more ad-hoc changes - disabling existing builders likely falls under that category! (and, even if we did, we're so close to capacity that we may still not be comfortable with adding another builder since we're already seeing adverse effects of limited builders in other ways than just PRs on this repo). @aturon or @alexcrichton may want to step in here or on the linked issue with any corrections to the above/other thoughts. |
@jackpot51 I'm not aware of a way for us accept external resources right now, but we can certainly discuss it in the next infra team meeting since it's probably something we'd like to enable. |
@aidanhs nah I think you're spot on! We're currently exploring various methods of expanding capacity, but we haven't got something concrete just yet. Additionally yes, while we'd like to support custom hardware we don't currently have the infrastructure to do so. |
☔ The latest upstream changes (presumably #43316) made this pull request unmergeable. Please resolve the merge conflicts. |
The core and infra team have made some progress talking about this, particularly for builders that just want a stdlib. We're not there yet, but it is something we're working on. Just to double check - am I correct in thinking that "just want a stdlib" is what you're looking for here? |
@aidanhs for now, that is correct |
Thanks for your patience here @jackpot51! Lots of teams have had a lot of discussion here, but the highlights here are:
So tl;dr we can merge this patch if you'd like by moving the new builder here into the existing |
@alexcrichton Yes, that all sounds good to me! Do you want me to modify the PR or will you? |
@jackpot51 oh if you could take care of it that'd be great, I have a feeling you can get it done much more quickly than I can! |
7827ab3
to
94635d7
Compare
@alexcrichton @aidanhs I have rebased and I have added Redox to the cross build. I removed the change that makes travis build dist-x86_64-redox, but I left in the Dockerfile for future usage. |
@@ -0,0 +1,42 @@ | |||
FROM ubuntu:16.04 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this is now equivalent to the cross
container, right? If not, can you edit the scripts here to use the shared scripts in the src/ci/docker/shared
folder?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you mean src/docker/scripts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This folder for shared scripts.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh sorry I also forgot to mention, but can this be moved to the src/ci/docker/disabled
folder?
@alexcrichton it should be simpler now. Since the toolchain installation is the same, the script in cross is used by the dist-x86_64-redox dockerfile |
friendly ping @alexcrichton, this looks ready for you! |
Ah sorry should have commented more prominently, bu the |
Ok, will do |
44a6e94
to
a3d9c36
Compare
@alexcrichton it is done |
@bors: r+ |
@bors: r+ |
📌 Commit 1cc33c0 has been approved by |
⌛ Testing commit 1cc33c0 with merge 69e6a7ff17a5c84e98f099832d2d5a40c2ae16e5... |
💔 Test failed - status-travis |
Legit. Please try to
|
Oops |
@kennytm @alexcrichton That script is marked executable in git now. |
@bors r=alexcrichton |
📌 Commit 727b473 has been approved by |
Add Redox Dockerfile and Travis Environment This adds Redox to the Travis build. This is an example implementation of #43206
☀️ Test successful - status-appveyor, status-travis |
🎉 🎉 🍰 🍰 🎆 🎆 |
@alexcrichton Redox rust-std is not present here: https://static.rust-lang.org/dist/nightly-channel.toml Is there something I am missing? |
Fixed here: #43950 |
This adds Redox to the Travis build. This is an example implementation of #43206