diff options
| author | John McCrae <john.mccrae@progress.com> | 2023-04-20 08:51:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-20 08:51:52 -0700 |
| commit | 7515da91dd4fe839cf07ce47994b613fc6bb72c3 (patch) | |
| tree | 8166495e729f3333b2847de39fe8a1682ffcf3f5 | |
| parent | 33ac0b9fe38794a573b60c6539a2c97cf72cbe3f (diff) | |
| parent | 99e3ae18614f94ea30524cc07803fca9abbcf936 (diff) | |
| download | chef-7515da91dd4fe839cf07ce47994b613fc6bb72c3.tar.gz | |
Merge pull request #13704 from chef/jfm/chef17_berkshelf_2
[Chef-17] 7 of X - Updating Berkshelf version
| -rw-r--r-- | omnibus/Gemfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index ca5e4f2339..49add630df 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -6,14 +6,15 @@ gem "artifactory" gem "pedump" +# Use Berkshelf for resolving cookbook dependencies +# Using a branch here that calls out a berkshelf version for chef-17 +gem "berkshelf", git: "https://github.com/chef/berkshelf.git", branch: "main" + # This development group is installed by default when you run `bundle install`, # but if you are using Omnibus in a CI-based infrastructure, you do not need # the Test Kitchen-based build lab. You can skip these unnecessary dependencies # by running `bundle config set --local without development && bundle install` to speed up build times. group :development do - # Use Berkshelf for resolving cookbook dependencies - gem "berkshelf", ">= 7.0" - # Use Test Kitchen with Vagrant for converging the build environment gem "test-kitchen", ">= 1.23" gem "kitchen-vagrant", ">= 1.3.1" |