summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2017-05-10 14:25:08 -0500
committerGitHub <noreply@github.com>2017-05-10 14:25:08 -0500
commit9e4d838680cd7bf436a16396c6779e38dc415182 (patch)
treeba0e07633acdc772277cd5c008b376494a2b97b5
parenta769920c0546caf6e90b38c71da91e327d87a080 (diff)
parent8a8fb79bfe656b830eaae5d63388064c1a55c0d6 (diff)
downloadchef-9e4d838680cd7bf436a16396c6779e38dc415182.tar.gz
Merge pull request #6141 from chef/lcg/fix-appveyor-on-chef-12
fix appveyor on chef-12
-rw-r--r--appveyor.yml15
1 files changed, 11 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml
index e3bf174e01..563dde4add 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -15,17 +15,23 @@ skip_tags: true
branches:
only:
- master
+ - chef-12
install:
- systeminfo
- winrm quickconfig -q
- SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
- - ps: $env:RUBYGEMS_VERSION=$(findstr rubygems omnibus_overrides.rb | %{ $_.split(" ")[3] })
- - ps: $env:BUNDLER_VERSION=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] })
- echo %PATH%
+ - ps: $env:OMNIBUS_RUBYGEMS=$(findstr rubygems omnibus_overrides.rb | %{ $_.split(" ")[3] })
+ - echo %OMNIBUS_RUBYGEMS%
+ - ps: $env:OMNIBUS_BUNDLER=$(findstr bundler omnibus_overrides.rb | %{ $_.split(" ")[3] })
+ - echo %OMNIBUS_BUNDLER%
- ruby --version
- - gem update --system %RUBYGEMS_VERSION% || gem update --system %RUBYGEMS_VERSION% || gem update --system %RUBYGEMS_VERSION%
- - gem install bundler -v %BUNDLER_VERSION% --quiet --no-ri --no-rdoc || gem install bundler -v %BUNDLER_VERSION% --quiet --no-ri --no-rdoc || gem install bundler -v %BUNDLER_VERSION% --quiet --no-ri --no-rdoc
+ - gem --version
+ - bundler --version
+ - gem uninstall bundler -a -x
+ - gem update --system %OMNIBUS_RUBYGEMS% || gem update --system %OMNIBUS_RUBYGEMS% || gem update --system %OMNIBUS_RUBYGEMS%
+ - gem install bundler -v %OMNIBUS_BUNDLER% --quiet --no-ri --no-rdoc || gem install bundler -v %OMNIBUS_BUNDLER% --quiet --no-ri --no-rdoc || gem install bundler -v %OMNIBUS_BUNDLER% --quiet --no-ri --no-rdoc
- gem --version
- bundler --version
- SET BUNDLE_IGNORE_CONFIG=true
@@ -33,6 +39,7 @@ install:
- SET BUNDLE_WITHOUT=development:guard:maintenance:tools:integration:changelog:docgen:travis:style:omnibus_package:aix:bsd:linux:mac_os_x:solaris
- appveyor DownloadFile http://curl.haxx.se/ca/cacert.pem -FileName C:\cacert.pem
- set SSL_CERT_FILE=C:\cacert.pem
+ - bundle env
build_script:
- bundle install || bundle install || bundle install