Skip to content

Commit

Permalink
fix windows tests
Browse files Browse the repository at this point in the history
Signed-off-by: mwrock <matt@mattwrock.com>
  • Loading branch information
mwrock committed Dec 4, 2020
1 parent 46ae1a3 commit 4602ffd
Show file tree
Hide file tree
Showing 19 changed files with 656,412 additions and 103,595 deletions.
29 changes: 15 additions & 14 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ expeditor:

steps:

- label: run-lint-and-specs-ruby-2.4
command:
- .expeditor/run_linux_tests.sh rake
expeditor:
executor:
docker:
image: ruby:2.4-buster
- label: run-lint-and-specs-ruby-2.4
command:
- .expeditor/run_linux_tests.sh rake
expeditor:
executor:
docker:
image: ruby:2.4-buster

- label: run-lint-and-specs-ruby-2.5
command:
- .expeditor/run_linux_tests.sh rake
expeditor:
executor:
docker:
- label: run-lint-and-specs-ruby-2.5
command:
- .expeditor/run_linux_tests.sh rake
expeditor:
executor:
docker:
image: ruby:2.5-buster

- label: run-lint-and-specs-ruby-2.6
Expand All @@ -40,7 +40,8 @@ steps:
- label: run-specs-windows
command:
- bundle install --jobs=7 --retry=3 --without docs debug
- bundle exec rake
- bundle exec rake style
- bundle exec rake unit
expeditor:
executor:
docker:
Expand Down
2 changes: 1 addition & 1 deletion lib/mixlib/install.rb
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def self.detect_platform
# to disallow unsigned powershell scripts. This changes it for just this
# powershell session, which allows this to run even if the execution policy
# is set higher.
Mixlib::ShellOut.new("powershell.exe -file #{File.join(d, "detect_platform.ps1")}", :env => { "PSExecutionPolicyPreference" => "Bypass" }).run_command
Mixlib::ShellOut.new("powershell.exe -NoProfile -file #{File.join(d, "detect_platform.ps1")}", :env => { "PSExecutionPolicyPreference" => "Bypass" }).run_command
end
else
Mixlib::ShellOut.new(detect_platform_sh).run_command
Expand Down
1 change: 1 addition & 0 deletions mixlib-install.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
spec.executables = ["mixlib-install"]
spec.require_paths = ["lib"]

spec.add_dependency "chef-utils", "= 16.6.14" if RUBY_VERSION < "2.6.0"
spec.add_dependency "mixlib-shellout"
spec.add_dependency "mixlib-versioning"
spec.add_dependency "thor"
Expand Down
Loading

0 comments on commit 4602ffd

Please sign in to comment.