Skip to content

Commit

Permalink
Pulling new chef-apply gem into omnibus build
Browse files Browse the repository at this point in the history
Signed-off-by: tyler-ball <tball@chef.io>
  • Loading branch information
tyler-ball committed Jul 9, 2018
1 parent b07cc1a commit faf319b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 19 deletions.
2 changes: 1 addition & 1 deletion omnibus/config/projects/chef-workstation.rb
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
# This is a build-time dependency, so we won't leave it behind:
dependency "rust-uninstall"

dependency "chef-run"
dependency "chef-apply"

dependency "gem-permissions"
dependency "rubygems-customization"
Expand Down
24 changes: 6 additions & 18 deletions omnibus/config/software/chef-apply.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,41 +14,29 @@
# limitations under the License.
#

name "chef-run"
default_version "local_source"
name "chef-apply"
default_version "master"

license :project_license

# For the specific super-special version "local_source", build the source from
# 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}/../../components/chef-run")
end

# For any version other than "local_source", fetch from github.
if version != "local_source"
source git: "https://github.com/chef/chef-workstation.git"
end
source git: "https://github.com/chef/chef-apply.git"

dependency "rubygems"
dependency "bundler"
dependency "ruby"
dependency "appbundler"
dependency "chef-dk"

relative_path "components/chef-run"

build do
# Setup a default environment from Omnibus - you should use this Omnibus
# helper everywhere. It will become the default in the future.
env = with_standard_compiler_flags(with_embedded_path)
bundle "install --without development", env: env
gem "build chef-run.gemspec", env: env
gem "install chef-run*.gem" \
gem "build chef-apply.gemspec", env: env
gem "install chef-apply*.gem" \
" --no-ri --no-rdoc" \
" --force" \
" --verbose --without development", env: env

appbundle "chef-run", lockdir: project_dir, without: %w{development localdev}, gem: 'chef-run', env: env
appbundle "chef-apply", lockdir: project_dir, without: %w{development localdev}, gem: 'chef-apply', env: env
end

0 comments on commit faf319b

Please sign in to comment.