File tree Expand file tree Collapse file tree 3 files changed +23
-9
lines changed Expand file tree Collapse file tree 3 files changed +23
-9
lines changed Original file line number Diff line number Diff line change @@ -10,10 +10,10 @@ before_install:
10
10
matrix :
11
11
fast_finish : true
12
12
include :
13
- - rvm : 2.3.1
13
+ - rvm : 2.4.0
14
14
bundler_args : --without system_tests
15
- env : PUPPET_GEM_VERSION="~> 4 .0"
16
- - rvm : 2.1.7
15
+ env : PUPPET_GEM_VERSION="~> 5 .0"
16
+ - rvm : 2.1.9
17
17
bundler_args : --without system_tests
18
18
env : PUPPET_GEM_VERSION="~> 4.0"
19
19
notifications :
Original file line number Diff line number Diff line change @@ -60,9 +60,9 @@ group :system_tests do
60
60
gem "beaker-pe" , :require => false
61
61
gem "beaker-rspec" , *location_for ( ENV [ 'BEAKER_RSPEC_VERSION' ] )
62
62
gem "beaker-hostgenerator" , *location_for ( ENV [ 'BEAKER_HOSTGENERATOR_VERSION' ] )
63
- gem "beaker-abs" , *location_for ( ENV [ 'BEAKER_ABS_VERSION' ] || '~> 0.1' )
63
+ gem "beaker-abs" , *location_for ( ENV [ 'BEAKER_ABS_VERSION' ] || '~> 0.1' )
64
64
gem "beaker-testmode_switcher" , '<= 0.2.0' , :require => false
65
- gem ' master_manipulator' , :require => false
65
+ gem " master_manipulator" , :require => false
66
66
end
67
67
68
68
gem 'puppet' , *location_for ( ENV [ 'PUPPET_GEM_VERSION' ] )
Original file line number Diff line number Diff line change @@ -14,14 +14,28 @@ environment:
14
14
RUBY_VER : 21
15
15
- PUPPET_GEM_VERSION : ~> 4.0
16
16
RUBY_VER : 21-x64
17
- - PUPPET_GEM_VERSION : ~> 4.0
18
- RUBY_VER : 23
19
- - PUPPET_GEM_VERSION : ~> 4.0
20
- RUBY_VER : 23-x64
17
+ - PUPPET_GEM_VERSION : ~> 5.0
18
+ RUBY_VER : 24
19
+ - PUPPET_GEM_VERSION : ~> 5.0
20
+ RUBY_VER : 24-x64
21
+ - PUPPET_GEM_VERSION : 4.7.1
22
+ RUBY_VER : 21-x64
21
23
matrix :
22
24
fast_finish : true
23
25
install :
24
26
- SET PATH=C:\Ruby%RUBY_VER%\bin;%PATH%
27
+ - ps : |
28
+ # AppVeyor appears to have OpenSSL headers available already
29
+ # which msys2 would normally install with:
30
+ # pacman -S mingw-w64-x86_64-openssl --noconfirm
31
+ #
32
+ if ( $(ruby --version) -match "^ruby\s+2\.4" ) {
33
+ Write-Output "Building OpenSSL gem ~> 2.0.4 to fix Ruby 2.4 / AppVeyor issue"
34
+ gem install openssl --version '~> 2.0.4' --no-ri --no-rdoc
35
+ }
36
+
37
+ gem list openssl
38
+ ruby -ropenssl -e 'puts \"OpenSSL Version - #{OpenSSL::OPENSSL_VERSION}\"; puts \"OpenSSL Library Version - #{OpenSSL::OPENSSL_LIBRARY_VERSION}\"'
25
39
- bundle install --jobs 4 --retry 2 --without system_tests
26
40
- type Gemfile.lock
27
41
build : off
You can’t perform that action at this time.
0 commit comments