Skip to content

Commit

Permalink
Merge branch 'use-fluentd-v1'
Browse files Browse the repository at this point in the history
  • Loading branch information
cosmo0920 committed Feb 4, 2018
2 parents 77a878d + e8b197b commit f696fba
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
source "https://rubygems.org"

gem "fluentd", "~> 0.14.0"
gem "fluentd", "~> 1.1.0"
if RUBY_PLATFORM =~ /mingw|mswin/
gem "win32-ipc"
gem "win32-event"
gem "windows-pr"
end
18 changes: 17 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,13 @@ environment:
- TARGET: x86_64-pc-windows-msvc
BITS: 64
RUSTVER: 1.23.0
ruby_version: "23-x64"
devkit: C:\Ruby23-x64\DevKit
- TARGET: x86_64-pc-windows-msvc
BITS: 64
RUSTVER: 1.23.0
ruby_version: "23"
devkit: C:\Ruby23\DevKit

install:
- ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:RUSTVER}-${env:TARGET}.exe"
Expand All @@ -17,8 +21,20 @@ install:
- SET PATH=%PATH%;C:\MinGW\bin
- rustc -V
- cargo -V
- SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
- "%devkit%\\devkitvars.bat"
- ruby --version
- bundle install

build: false

before_test:
ps: |
$job = Start-Process bundle -ArgumentList "exec", "fluentd","-c", ".\conf\in_forward.conf" -NoNewWindow -PassThru
$Env:FLUENTD_JOB_ID = $job.Id
test_script:
- cargo test
- cargo test --features "readme-testing fluentd"

after_test:
- ps: Stop-Process -Id $Env:FLUENTD_JOB_ID

0 comments on commit f696fba

Please sign in to comment.