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.

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

Make the plans' build use rust-toolchain version #6680

Merged
merged 3 commits into from Jun 24, 2019

Conversation

@baumanj
Copy link
Member

commented Jun 22, 2019

Set the particular version of core/rust that the habitat components depend upon to build based on the rust-toolchain file that governs plain cargo-based builds of these crates.

Make the hab plan's rust build dep correspond to the rust-toolchain v…
…ersion

Signed-off-by: Jon Bauman <5906042+baumanj@users.noreply.github.com>

@baumanj baumanj self-assigned this Jun 22, 2019

@mwrock
Copy link
Contributor

left a comment

we should probably make this change to all the rust binary based plan.sh and plan.ps1 in one swoop so we don't end up with a release that has mixed rust versions.

@mwrock

This comment has been minimized.

Copy link
Contributor

commented Jun 24, 2019

Interesting. It also looks likr the 1.35 package was never promoted

@mwrock mwrock self-assigned this Jun 24, 2019

@raskchanky

This comment has been minimized.

Copy link
Member

commented Jun 24, 2019

@mwrock I promoted it just now

pin to rust-toolchain in ps1 plans
Signed-off-by: mwrock <matt@mattwrock.com>
@mwrock

This comment has been minimized.

Copy link
Contributor

commented Jun 24, 2019

cool i built and promoted the windows rust and added commit to affect the relevant ps1 plans

Make the plan.sh's use rust-toolchain version
This should update all the remaining plan.sh-based habitat component
plans to use the rust-toolchain file to set the version of their
core/rust build dependency.

Signed-off-by: Jon Bauman <5906042+baumanj@users.noreply.github.com>

@baumanj baumanj marked this pull request as ready for review Jun 24, 2019

@baumanj baumanj requested review from scotthain and smacfarlane Jun 24, 2019

@baumanj

This comment has been minimized.

Copy link
Member Author

commented Jun 24, 2019

This is ready for review now. I think team Scott (@scotthain & @smacfarlane) will likely be the best judges of whether I've done something ill-advised.

@mwrock

mwrock approved these changes Jun 24, 2019

@christophermaier
Copy link
Contributor

left a comment

Seems sane!

@scotthain
Copy link
Contributor

left a comment

So in the general case, I would be against pinning here because it goes against our overall strategies of drinking our own champagne first. That being said, I think this is fine for the moment, because it gives us a needed layer of safety, and there is a pattern we have that we will be implementing (hopefully in the near future) to safely update the version and this is a first step needed to realize that. tl;dr looks good.

@baumanj

This comment has been minimized.

Copy link
Member Author

commented Jun 24, 2019

So in the general case, I would be against pinning here because it goes against our overall strategies of drinking our own champagne first.

Can you elaborate?

The idea is that we upgrade to new versions of rust once we've locally verified that everything in habitat seems to build and run correctly (and hopefully we fix up new warnings and such), and then we can flip the switch to a new version in exactly one place. Why wouldn't we want a cargo build -p hab and build components/hab (in a studio) to build using the same rust version?

@baumanj baumanj merged commit 698cc63 into master Jun 24, 2019

5 checks passed

DCO This commit has a DCO Signed-off-by
Details
buildkite/habitat-sh-habitat-master-verify Build #2485 passed (40 minutes, 37 seconds)
Details
buildkite/habitat-sh-habitat-master-website Build #2972 passed (33 seconds)
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
expeditor/config-validation Validated your Expeditor config file
Details

@baumanj baumanj deleted the plans-use-rust-toolchain-file branch Jun 24, 2019

chef-ci added a commit that referenced this pull request Jun 24, 2019

Update CHANGELOG.md with details from pull request #6680
Obvious fix; these changes are the result of automation not creative thinking.
@scotthain

This comment has been minimized.

Copy link
Contributor

commented Jun 25, 2019

I'm more referring to "take the latest as it is released" - we will build automation that will do that when new core/rust is released so we can verify what needs to be fixed as needed. When I said "pinning here" i meant in the hab project, not in a rust-toolchain file, I'm all for the pinning in 1 place.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.