Skip to content

Commit 280431f

Browse files
committed
(MODULES-5187) mysnc puppet 5 and ruby 2.4
1 parent 517a133 commit 280431f

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ matrix:
2222
script: bundle exec rake beaker
2323
services: docker
2424
sudo: required
25-
- rvm: 2.3.1
25+
- rvm: 2.4.0
2626
bundler_args: --without system_tests
27-
env: PUPPET_GEM_VERSION="~> 4.0"
28-
- rvm: 2.1.7
27+
env: PUPPET_GEM_VERSION="~> 5.0"
28+
- rvm: 2.1.9
2929
bundler_args: --without system_tests
3030
env: PUPPET_GEM_VERSION="~> 4.0"
3131
notifications:

appveyor.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +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
21-
- PUPPET_GEM_VERSION: 4.2.3
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
2222
RUBY_VER: 21-x64
2323
matrix:
2424
fast_finish: true
2525
install:
2626
- 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}\"'
2739
- bundle install --jobs 4 --retry 2 --without system_tests
2840
- type Gemfile.lock
2941
build: off

0 commit comments

Comments
 (0)