Skip to content

Commit f8aac54

Browse files
eputnamglennsarti
authored andcommitted
(MODULES-5187) mysnc puppet 5 and ruby 2.4
1 parent 4a090f2 commit f8aac54

File tree

3 files changed

+23
-9
lines changed

3 files changed

+23
-9
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ before_install:
1010
matrix:
1111
fast_finish: true
1212
include:
13-
- rvm: 2.3.1
13+
- rvm: 2.4.0
1414
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
1717
bundler_args: --without system_tests
1818
env: PUPPET_GEM_VERSION="~> 4.0"
1919
notifications:

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ group :system_tests do
6060
gem "beaker-pe", :require => false
6161
gem "beaker-rspec", *location_for(ENV['BEAKER_RSPEC_VERSION'])
6262
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')
6464
gem "beaker-testmode_switcher", '<= 0.2.0', :require => false
65-
gem 'master_manipulator', :require => false
65+
gem "master_manipulator", :require => false
6666
end
6767

6868
gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])

appveyor.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,28 @@ environment:
1414
RUBY_VER: 21
1515
- PUPPET_GEM_VERSION: ~> 4.0
1616
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
2123
matrix:
2224
fast_finish: true
2325
install:
2426
- 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}\"'
2539
- bundle install --jobs 4 --retry 2 --without system_tests
2640
- type Gemfile.lock
2741
build: off

0 commit comments

Comments
 (0)