diff options
| author | John McCrae <jmccrae@chf.io> | 2022-03-17 10:24:39 -0700 |
|---|---|---|
| committer | John McCrae <jmccrae@chf.io> | 2022-03-17 10:24:39 -0700 |
| commit | a685f1281ea9f292c82aea539a8971f2fec05c37 (patch) | |
| tree | 5bc429086384085fd334a035c6b2bef35c458fc0 | |
| parent | 14e01c080d738b041f04a1899feecb6946079c8c (diff) | |
| download | chef-a685f1281ea9f292c82aea539a8971f2fec05c37.tar.gz | |
Updating win32.gemspec and releasing a new build. Also backporting Ruby 3.0 rspec updates
Signed-off-by: John McCrae <jmccrae@chf.io>
| -rw-r--r-- | .github/workflows/kitchen.yml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index 267e8d88e2..f2c278aa6c 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -44,13 +44,6 @@ jobs: run: | cd kitchen-tests $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH - bundle install --jobs=3 --retry=3 - # If ($lastexitcode -ne 0) { Exit $lastexitcode } - # The bundle install command above fails because our build on windows on ruby-3.0 is - # completely broken when it comes to installing native gems. Until that is fixed we - # need to ignore that error code and to manually install berkshelf below. This is a - # very bad hack. - # htmldiff and ldiff on windows cause a conflict with gems being loaded below. # we remove thenm here. if (Test-Path C:\opscode\chef\embedded\bin\htmldiff) @@ -64,6 +57,14 @@ jobs: $output = gci -path C:\opscode\ -file ansidecl.h -Recurse $target_path = $($output.Directory.Parent.FullName + "\x86_64-w64-mingw32\include") Move-Item -Path $output.FullName -Destination $target_path + + bundle install --jobs=3 --retry=3 + # If ($lastexitcode -ne 0) { Exit $lastexitcode } + # The bundle install command above fails because our build on windows on ruby-3.0 is + # completely broken when it comes to installing native gems. Until that is fixed we + # need to ignore that error code and to manually install berkshelf below. This is a + # very bad hack. + If ($lastexitcode -ne 0) { Exit $lastexitcode } gem install berkshelf --no-doc If ($lastexitcode -ne 0) { Exit $lastexitcode } |