diff options
| author | John McCrae <jmccrae@chf.io> | 2022-03-17 09:25:53 -0700 |
|---|---|---|
| committer | John McCrae <jmccrae@chf.io> | 2022-03-17 09:25:53 -0700 |
| commit | 0e8e34117f280ae0b029f3bac6c535c1596dde1a (patch) | |
| tree | e6328c67509f55038b13e4cc183716680f76744b | |
| parent | c064429ee62d292f4b16db977186025687ceba60 (diff) | |
| download | chef-0e8e34117f280ae0b029f3bac6c535c1596dde1a.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, 15 insertions, 0 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index 4fb635e1fb..82cf8f63c6 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -50,6 +50,21 @@ jobs: # 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) + { + Remove-Item -Path C:\opscode\chef\embedded\bin\htmldiff + Remove-Item -Path C:\opscode\chef\embedded\bin\ldiff + } + # The chef-client installer does not put the file 'ansidecl.h' down in the correct location + # This leads to failures during testing. Moving that file to its correct position here. + # Another example of 'bad' that needs to be corrected + $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 + gem install berkshelf --no-doc If ($lastexitcode -ne 0) { Exit $lastexitcode } berks vendor cookbooks |