diff options
author | Miah Johnson <miah@chia-pet.org> | 2018-04-27 00:54:14 -0700 |
---|---|---|
committer | Miah Johnson <miah@chia-pet.org> | 2018-04-27 00:55:13 -0700 |
commit | 76981b9e80a240603b9462deddaa82d5dcd0ec3f (patch) | |
tree | 056244c2c3d596090e4853b00baaea5d94b19d53 | |
parent | 637bbba1d274320f0455e262c0a0bdc7390d75e5 (diff) | |
download | chef-miah/inspec_core.tar.gz |
Use the 'core' versions of train and inspec with minimal dependencies.miah/inspec_core
Signed-off-by: Miah Johnson <miah@chia-pet.org>
-rw-r--r-- | omnibus/config/projects/chef.rb | 3 | ||||
-rw-r--r-- | omnibus/config/software/inspec-core.rb (renamed from omnibus/config/software/train.rb) | 8 | ||||
-rw-r--r-- | omnibus/config/software/train-core.rb | 18 |
3 files changed, 23 insertions, 6 deletions
diff --git a/omnibus/config/projects/chef.rb b/omnibus/config/projects/chef.rb index a5b9a7d3ba..7c40123053 100644 --- a/omnibus/config/projects/chef.rb +++ b/omnibus/config/projects/chef.rb @@ -52,7 +52,8 @@ dependency "preparation" # FIXME: must remove this ASAP. dependency "unf_ext" -dependency "train" +dependency "train-core" +dependency "inspec-core" dependency "chef" diff --git a/omnibus/config/software/train.rb b/omnibus/config/software/inspec-core.rb index b877c1eeb1..8ba6416be3 100644 --- a/omnibus/config/software/train.rb +++ b/omnibus/config/software/inspec-core.rb @@ -1,6 +1,4 @@ -# encoding: utf-8 - -name 'train' +name 'inspec-core' dependency 'ruby' dependency 'rubygems' @@ -8,8 +6,8 @@ dependency 'bundler' dependency 'appbundler' license :project_license -default_version 'add-gcp-transport' -source git: 'https://github.com/chef-partners/train.git' +default_version 'miah/inspec_core' +source git: 'https://github.com/chef/inspec.git' skip_transitive_dependency_licensing true build do diff --git a/omnibus/config/software/train-core.rb b/omnibus/config/software/train-core.rb new file mode 100644 index 0000000000..4042fb7b67 --- /dev/null +++ b/omnibus/config/software/train-core.rb @@ -0,0 +1,18 @@ +name 'train-core' + +dependency 'ruby' +dependency 'rubygems' +dependency 'bundler' +dependency 'appbundler' + +license :project_license +default_version 'miah/train_core' +source git: 'https://github.com/chef/train.git' +skip_transitive_dependency_licensing true + +build do + env = with_standard_compiler_flags(with_embedded_path) + delete "#{name}-*.gem" + gem "build #{name}.gemspec", env: env + gem "install #{name}-*.gem --no-document", env: env +end |