diff --git a/.github/workflows/ctl-cookbook-testing.yml b/.github/workflows/ctl-cookbook-testing.yml index e3585304e..e0dc12d50 100644 --- a/.github/workflows/ctl-cookbook-testing.yml +++ b/.github/workflows/ctl-cookbook-testing.yml @@ -27,7 +27,8 @@ jobs: - uses: actions/checkout@v2 - uses: ruby/setup-ruby@v1 with: - working-directory: omnibus + # once we move the -ctl command to its own gemspec this can be changed back to omnibus like above + working-directory: omnibus/cookbooks/omnibus-supermarket ruby-version: 2.6 bundler-cache: true - uses: r7kamura/rubocop-problem-matchers-action@v1 # this shows the failures in the PR diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index e21b81556..c69ad4f50 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: a4f73e48a8d2e276fccda71dc99d217ee27a5464 + revision: f6b11c27a4610070fc56e158550c3d470368f638 specs: omnibus-software (4.0.0) omnibus (>= 8.0.0) @@ -32,17 +32,17 @@ GEM ast (2.4.2) awesome_print (1.9.2) aws-eventstream (1.1.1) - aws-partitions (1.479.0) - aws-sdk-core (3.117.0) + aws-partitions (1.480.0) + aws-sdk-core (3.118.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.44.0) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-kms (1.45.0) + aws-sdk-core (~> 3, >= 3.118.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.96.2) - aws-sdk-core (~> 3, >= 3.112.0) + aws-sdk-s3 (1.97.0) + aws-sdk-core (~> 3, >= 3.118.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) aws-sigv4 (1.2.4) @@ -62,12 +62,12 @@ GEM solve (~> 4.0) thor (>= 0.20) builder (3.2.4) - chef (16.13.16) + chef (16.14.1) addressable bcrypt_pbkdf (~> 1.1) bundler (>= 1.10) - chef-config (= 16.13.16) - chef-utils (= 16.13.16) + chef-config (= 16.14.1) + chef-utils (= 16.14.1) chef-vault chef-zero (>= 14.0.11) diff-lcs (>= 1.2.4, < 1.4.0) @@ -112,17 +112,17 @@ GEM mixlib-shellout (>= 2.0, < 4.0) pastel (~> 0.7) solve (> 2.0, < 5.0) - chef-config (16.13.16) + chef-config (16.14.1) addressable - chef-utils (= 16.13.16) + chef-utils (= 16.14.1) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) tomlrb (~> 1.2) - chef-telemetry (1.0.29) + chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (16.13.16) + chef-utils (16.14.1) chef-vault (4.1.0) chef-zero (15.0.7) ffi-yajl (~> 2.2) @@ -180,7 +180,7 @@ GEM highline (2.0.3) httpclient (2.8.3) iniparse (1.5.0) - inspec-core (4.38.3) + inspec-core (4.38.9) addressable (~> 2.4) chef-telemetry (~> 1.0, >= 1.0.8) faraday (>= 0.9.0, < 1.5) @@ -355,7 +355,7 @@ GEM toml-rb (2.0.1) citrus (~> 3.0, > 3.0) tomlrb (1.3.0) - train-core (3.7.4) + train-core (3.8.1) addressable (~> 2.5) ffi (!= 1.13.0) json (>= 1.8, < 3.0) @@ -424,4 +424,4 @@ DEPENDENCIES test-kitchen BUNDLED WITH - 2.1.2 + 2.2.22 diff --git a/omnibus/cookbooks/omnibus-supermarket/Gemfile b/omnibus/cookbooks/omnibus-supermarket/Gemfile new file mode 100644 index 000000000..33391f7ed --- /dev/null +++ b/omnibus/cookbooks/omnibus-supermarket/Gemfile @@ -0,0 +1,13 @@ +# This gemfile is currently used in the omnibus build for the -ctl command +# Why is it here? Great question. This needs to get refactored away with the +# ctl command have its own gemspec. + +gem 'inspec' +gem 'inspec-bin' + +# gems for testing the build cookbooks +# once we get the ctl omnibus def using its own gemspec this whole file can die +# including this group here +group :test do + gem 'chefspec' +end