Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update test and travis-ci setting #1570

Merged
merged 2 commits into from
May 13, 2017
+6 −5
Merged

Update test and travis-ci setting #1570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ace06c8
travis-ci: update xcode for Mac and ruby for Linux
repeatedly May 12, 2017
d2efddc
Omit TLS and non ack test on Windows temporarily
repeatedly May 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ matrix:
os: linux
- rvm: 2.3.3
os: linux
- rvm: 2.4.0
- rvm: 2.4.1
os: linux
- rvm: ruby-head
os: linux
- rvm: 2.1.10
os: osx
osx_image: xcode8.2 # OSX 10.12
osx_image: xcode8.3 # OSX 10.12
# - rvm: 2.2.6
# os: osx
# osx_image: xcode8.2 # OSX 10.12
Expand All @@ -28,17 +28,16 @@ matrix:
# osx_image: xcode8.2 # OSX 10.12
- rvm: 2.4.0
os: osx
osx_image: xcode8.2 # OSX 10.12
osx_image: xcode8.3 # OSX 10.12
- rvm: ruby-head
os: osx
osx_image: xcode 8.2 # OSX 10.12
osx_image: xcode 8.3 # OSX 10.12
allow_failures:
- rvm: ruby-head

branches:
only:
- master
- v0.10
- v0.12
- v0.14

Expand Down
2 changes: 2 additions & 0 deletions test/plugin/test_out_forward.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,8 @@ def read_ack_from_sock(sock, unpacker)
data('ack true' => true,
'ack false' => false)
test 'TLS transport and ack parameter combination' do |ack|
omit "TLS and 'ack false' always fails on AppVeyor. Need to debug" if Fluent.windows? && !ack

input_conf = TARGET_CONFIG + %[
<transport tls>
insecure true
Expand Down