diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-09-05 13:38:14 +0600 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2022-09-05 13:38:14 +0600 |
| commit | feb565b2a99291ab32bb92bc23ceb2c188d53286 (patch) | |
| tree | 6c7694cb99a184a50bfc7558c357ee18ac8d8fa7 | |
| parent | 3d07afbc0d173d6de4f8d9daa896aca236c31a20 (diff) | |
| download | chef-feb565b2a99291ab32bb92bc23ceb2c188d53286.tar.gz | |
overcoming the new failures with duplicate bundler versions
Signed-off-by: John McCrae <john.mccrae@progress.com>
| -rw-r--r-- | .github/workflows/kitchen.yml | 4 | ||||
| -rw-r--r-- | habitat/plan.ps1 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index acf2700432..14db5f13ae 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -145,7 +145,7 @@ jobs: /opt/chef/bin/ohai -v /opt/chef/embedded/bin/rake --version echo "Updating Bundler" - gem install bundler:2.3.18 + bundle update --bundler echo "finished updating Bundler, now getting the version" /opt/chef/embedded/bin/bundle -v echo "finished getting the bundler version" @@ -160,7 +160,7 @@ jobs: source ~/.zshrc rbenv install 3.1.2 rbenv global 3.1.2 - gem install bundler:2.3.18 + bundle update --bundler echo "which bundler are we using?" which bundle echo "what version is that?" diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 4b37b27e59..2c26fae8dc 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -71,7 +71,7 @@ function Invoke-Prepare { "@ $gem_file | Set-Content "$PWD\\gem.bat" $env:Path += ";c:\\Program Files\\Git\\bin" - gem install bundler:2.3.17 + bundle update --bundler Write-BuildLine " ** Configuring bundler for this build environment" bundle config --local without server docgen maintenance pry travis integration ci chefstyle if (-not $?) { throw "unable to configure bundler to restrict gems to be installed" } |