summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpoornima <poorndm@progress.com>2022-07-05 15:46:08 +0530
committerpoornima <poorndm@progress.com>2022-07-05 15:46:08 +0530
commit98902899c819be9a6efb874aba6644d0c7273b75 (patch)
tree4abc10619ccee6628fc3b103500a74f08084356f
parent8d0d181cec86ca1365eb790177ac8ca2630d2101 (diff)
downloadchef-test_windows_plan.tar.gz
Revert gemlock changes + plan.ps1test_windows_plan
Signed-off-by: poornima <poorndm@progress.com>
-rw-r--r--Gemfile.lock2
-rw-r--r--habitat/plan.ps13
2 files changed, 2 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a9940a31c1..9a292e901f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
GIT
remote: https://github.com/chef/ohai.git
- revision: 88ddc94275c7618cb92a67c277993c89fc9c2109
+ revision: 062d2b42bc3c235335956ee2ff62d1f520714637
branch: main
specs:
ohai (18.0.14)
diff --git a/habitat/plan.ps1 b/habitat/plan.ps1
index 95c2da23dd..673a5c2dec 100644
--- a/habitat/plan.ps1
+++ b/habitat/plan.ps1
@@ -94,8 +94,7 @@ function Invoke-Build {
}
}
Write-BuildLine " ** Running the chef project's 'rake install' to install the path-based gems so they look like any other installed gem."
- bundle install
- bundle exec rake install # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler
+ bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler
if (-not $?) {
Write-Warning " -- That didn't work. Let's try again."
bundle exec rake install:local # this needs to be 'bundle exec'd because a Rakefile makes reference to Bundler