diff options
| author | John McCrae <jmccrae@chf.io> | 2022-05-24 15:22:29 +0600 |
|---|---|---|
| committer | John McCrae <jmccrae@chf.io> | 2022-05-24 15:22:29 +0600 |
| commit | 72080139235ecab69769270c04f808fe8501f915 (patch) | |
| tree | eb6b7d0eafb0062fbf312547fa4a93614a7ee92a | |
| parent | 44e0f6680a9a2ffbd519c29e517a8f962d428eec (diff) | |
| download | chef-72080139235ecab69769270c04f808fe8501f915.tar.gz | |
backport Windows Certificate fixes to Chef-17
Signed-off-by: John McCrae <jmccrae@chf.io>
| -rw-r--r-- | .github/workflows/kitchen.yml | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index c9b77573ad..2a3245111d 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -30,6 +30,14 @@ jobs: run: | $env:PATH = "C:\opscode\chef\bin;C:\opscode\chef\embedded\bin;" + $env:PATH $env:OHAI_VERSION = ( Select-String -Path .\Gemfile.lock -Pattern '(?<=ohai \()\d.*(?=\))' | ForEach-Object { $_.Matches[0].Value } ) + + # 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 appbundler appbundle-updater --no-doc If ($lastexitcode -ne 0) { Exit $lastexitcode } appbundle-updater chef chef $env:GITHUB_SHA --tarball --github $env:GITHUB_REPOSITORY @@ -51,12 +59,6 @@ jobs: 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 bundle install --jobs=3 --retry=3 # If ($lastexitcode -ne 0) { Exit $lastexitcode } @@ -70,7 +72,7 @@ jobs: If ($lastexitcode -ne 0) { Exit $lastexitcode } berks vendor cookbooks If ($lastexitcode -ne 0) { Exit $lastexitcode } - chef-client -z -o end_to_end --chef-license accept-no-persist + chef-client -z -o end_to_end --chef-license accept-no-persistt macos: strategy: |