-
Notifications
You must be signed in to change notification settings - Fork 170
Conversation
@@ -32,6 +32,18 @@ | |||
install_dir "#{default_root}/#{name}" | |||
end | |||
|
|||
if windows? | |||
override :ruby, version: "2.1.6" |
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.
Don't need if/else branches now.
Just
override :ruby, version: "2.1.6"
The default devkit is the latest one and it correctly select the platform bit-ness for you.
153e85c
to
a02d923
Compare
a02d923
to
d38c68c
Compare
👍 |
|
||
dependency "rubygems" | ||
dependency "bundler" | ||
dependency "appbundler" | ||
# windows does not have native readline support with compiled ruby | ||
dependency "rb-readline" if windows? |
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.
Minor nit: I would put this in the project definition instead of here because chefdk (the software) shouldn't technically care about the exactly it gets ruby or even if it gets readline. chefdk the project on the other hand probably cares about the platforms its packaging for.
This way, if we every get to refactoring the ruby software definition, we can move all the ruby related pre and post install steps into one place.
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 actually did this due to the fact that we don't compile with readline at all--this is necessary for the software def to work at present.
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.
and I think based on a recent commit in chef, we can omit if windows?
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.
reiterating this - it'll also make #748 redundant and keep things consistent. Add it as a dependency right below "preparation" and that way, ruby gets installed and cached as one of the first things in this project.
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.
Done
d38c68c
to
2286982
Compare
2286982
to
cac0dc2
Compare
cac0dc2
to
41ed3cb
Compare
2555a08
to
85e057f
Compare
99ded5d
to
4acc878
Compare
4acc878
to
3f16fd8
Compare
3f16fd8
to
cdf6620
Compare
@@ -39,6 +44,7 @@ | |||
override :'kitchen-inspec', version: "v0.12.3" | |||
|
|||
override :berkshelf, version: "v4.3.0" | |||
override :'dep-selector-libgecode', version: "1.2.0" |
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.
Can you bump this in omnibus-software? (As follow up work if you want to...)
24dd219
to
41401a1
Compare
41401a1
to
b692905
Compare
👍 |
b692905
to
6f56423
Compare
No description provided.