Skip to content
This repository has been archived by the owner on Jul 14, 2021. It is now read-only.

Add chef-bin dependency #2084

Merged
merged 2 commits into from
May 16, 2019
Merged

Add chef-bin dependency #2084

merged 2 commits into from
May 16, 2019

Conversation

tas50
Copy link
Contributor

@tas50 tas50 commented May 15, 2019

This is needed for Chef 15+

Signed-off-by: Tim Smith tsmith@chef.io

@tas50 tas50 requested a review from a team as a code owner May 15, 2019 20:46
@tas50 tas50 requested a review from lamont-granquist May 16, 2019 00:18
This is needed for Chef 15+

Signed-off-by: Tim Smith <tsmith@chef.io>
@@ -7,7 +23,7 @@
# the local git checkout. This is what you'd want to occur by default if you
# just ran omnibus build locally.
version("local_source") do
source path: File.expand_path("../..", project.files_path),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a sync from chef/chef

end

# For nokogiri
dependency "libxml2"
dependency "libxslt"
dependency "liblzma"
dependency "zlib"
dependency "libarchive"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a dupe dep

@@ -72,12 +87,13 @@

env["NOKOGIRI_USE_SYSTEM_LIBRARIES"] = "true"

appbundle "chef", lockdir: project_dir, gem: "chef", without: %w{integration docgen maintenance ci travis}, env: env
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Removing groups that aren't in chef gemfile anymore

@@ -20,15 +36,14 @@

# For any version other than "local_source", fetch from github.
if version != "local_source"
source git: "git://github.com/chef/chef-dk.git"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sync from chef/chef

This will also be faster since it's smaller.

Signed-off-by: Tim Smith <tsmith@chef.io>
@tas50 tas50 merged commit 2f1400e into master May 16, 2019
@chef-ci chef-ci deleted the chef-bin branch May 16, 2019 03:16
@lock
Copy link

lock bot commented Jul 15, 2019

This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.

@lock lock bot locked as resolved and limited conversation to collaborators Jul 15, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants