diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-08-03 08:30:16 -0700 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2022-08-03 09:07:24 -0700 |
| commit | 62eead4ec2154f3b4b59dc799bccfdfbd869f6db (patch) | |
| tree | e9cf95ef4d5f5764eb4c41fdbad3149671a858e0 | |
| parent | 5d885ffa1917b3c4213d57e815eb3f6c9d9d6f70 (diff) | |
| download | chef-62eead4ec2154f3b4b59dc799bccfdfbd869f6db.tar.gz | |
adding mac testing in, it was overlooked
Signed-off-by: John McCrae <john.mccrae@progress.com>
| -rw-r--r-- | .github/workflows/kitchen.yml | 20 | ||||
| -rw-r--r-- | spec/functional/resource/windows_font_spec.rb | 3 |
2 files changed, 7 insertions, 16 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index d566297cf7..c2b7fdcfe0 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -57,8 +57,6 @@ jobs: ruby -v if (-not $?) { throw "Can't run Ruby. Is it installed?" } } - $old_ruby = Get-Command -Name Ruby - Write-Output "NOW Which Ruby are we using? : " $old_ruby.Path - name: 'Install Chef/Ohai from Omnitruck' id: install_chef @@ -103,8 +101,6 @@ jobs: # Remove-Item -Path C:\opscode\chef\embedded\bin\htmldiff # Remove-Item -Path C:\opscode\chef\embedded\bin\ldiff # } - $old_ruby = Get-Command -Name Ruby - Write-Output "NOW Which Ruby are we using? : " $old_ruby.Path bundle install --jobs=3 --retry=3 # If ($lastexitcode -ne 0) { Exit $lastexitcode } @@ -152,15 +148,7 @@ jobs: # - name: 'Upgrade Chef/Ohai via Appbundler' # id: upgrade # run: | - # brew install rbenv ruby-build - # touch ~/.zshrc - # export PATH="$HOME/.rbenv/bin:$PATH" - # export HOMEBREW_NO_ENV_HINTS - # echo 'eval "$(rbenv init - zsh)"' >> ~/.zshrc - # source ~/.zshrc - # rbenv install 3.1.2 - # rbenv global 3.1.2 - # OHAI_VERSION=$(sed -n '/ohai .[0-9]/{s/.*(//;s/)//;p;}' Gemfile.lock) + OHAI_VERSION=$(sed -n '/ohai .[0-9]/{s/.*(//;s/)//;p;}' Gemfile.lock) - name: 'Run end_to_end::default recipe' id: run run: | @@ -184,9 +172,9 @@ jobs: sudo bundle install cd kitchen-tests sudo bundle install --jobs=3 --retry=3 - # sudo gem install kitchen - # sudo gem install berkshelf --no-doc - # sudo berks vendor cookbooks + sudo gem install kitchen + sudo gem install berkshelf --no-doc + sudo berks vendor cookbooks # sudo /opt/chef/bin/chef-client -z -o end_to_end --chef-license accept-no-persist linux: diff --git a/spec/functional/resource/windows_font_spec.rb b/spec/functional/resource/windows_font_spec.rb index eafd83e154..92e7b0395c 100644 --- a/spec/functional/resource/windows_font_spec.rb +++ b/spec/functional/resource/windows_font_spec.rb @@ -37,6 +37,9 @@ describe Chef::Resource::WindowsFont, :windows_only do resource end + ## these were commented out because testing hangs in the verify pipeline with them enabled. WEIRD + ## that needs to be addressed + # it "installs font on first install" do # subject.run_action(:install) # expect(subject).to be_updated_by_last_action |