summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn McCrae <jmccrae@chf.io>2022-03-17 10:11:26 -0700
committerJohn McCrae <jmccrae@chf.io>2022-03-17 10:11:26 -0700
commit14e01c080d738b041f04a1899feecb6946079c8c (patch)
treec080bbc6dc0a0626ae25bb666a96defc157a0b0e
parent0e8e34117f280ae0b029f3bac6c535c1596dde1a (diff)
downloadchef-14e01c080d738b041f04a1899feecb6946079c8c.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/func_spec.yml2
-rw-r--r--.github/workflows/kitchen.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/func_spec.yml b/.github/workflows/func_spec.yml
index 27cee8a7f4..2247b414fd 100644
--- a/.github/workflows/func_spec.yml
+++ b/.github/workflows/func_spec.yml
@@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: [windows-2019, windows-2016]
+ os: [windows-2019, windows-2022]
# Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
ruby: [2.7, '3.0']
runs-on: ${{ matrix.os }}
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml
index 82cf8f63c6..267e8d88e2 100644
--- a/.github/workflows/kitchen.yml
+++ b/.github/workflows/kitchen.yml
@@ -64,7 +64,7 @@ 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
-
+ If ($lastexitcode -ne 0) { Exit $lastexitcode }
gem install berkshelf --no-doc
If ($lastexitcode -ne 0) { Exit $lastexitcode }
berks vendor cookbooks