From 287e79a3607e5a69db665609758ec8bc0a8c3a20 Mon Sep 17 00:00:00 2001 From: uu59 Date: Mon, 30 Nov 2015 14:08:01 +0900 Subject: [PATCH] Move to Travis CI --- .rspec | 1 + .travis.yml | 8 ++++++++ README.md | 2 +- circle.yml | 15 --------------- spec/models/fluentd_spec.rb | 2 -- spec/spec_helper.rb | 5 ----- 6 files changed, 10 insertions(+), 23 deletions(-) create mode 100644 .travis.yml delete mode 100644 circle.yml diff --git a/.rspec b/.rspec index 4e1e0d2..f55b0ca 100644 --- a/.rspec +++ b/.rspec @@ -1 +1,2 @@ --color +-f d diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..6ab239a --- /dev/null +++ b/.travis.yml @@ -0,0 +1,8 @@ +rvm: 2.1.3 + +sudo: required + +install: + - wget http://packages.treasuredata.com.s3.amazonaws.com/2/ubuntu/precise/pool/contrib/t/td-agent/td-agent_2.2.0-0_amd64.deb + - sudo dpkg -i td-agent_2.2.0-0_amd64.deb + - bundle install --jobs=4 --retry=4 diff --git a/README.md b/README.md index a833339..bda200d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # fluentd-ui -[![build status](https://circleci.com/gh/fluent/fluentd-ui.png?style=shield&circle-token=a739a52ae9ae6774ab2192d4236a5f93ac29e11e)](https://circleci.com/gh/fluent/fluentd-ui) +[![Build Status](https://travis-ci.org/fluent/fluentd-ui.svg?branch=master)](https://travis-ci.org/fluent/fluentd-ui) [![Gem Version](https://badge.fury.io/rb/fluentd-ui.svg)](http://badge.fury.io/rb/fluentd-ui) [![Code Climate](https://codeclimate.com/github/fluent/fluentd-ui/badges/gpa.svg)](https://codeclimate.com/github/fluent/fluentd-ui) diff --git a/circle.yml b/circle.yml deleted file mode 100644 index cf4a316..0000000 --- a/circle.yml +++ /dev/null @@ -1,15 +0,0 @@ -machine: - environment: - SPEC_OPTS: "-f d --color" - ruby: - version: 2.1.3 - -checkout: - post: - - mkdir -p tmp - - sync - -dependencies: - pre: - - wget http://packages.treasuredata.com.s3.amazonaws.com/2/ubuntu/precise/pool/contrib/t/td-agent/td-agent_2.2.0-0_amd64.deb - - sudo dpkg -i td-agent_2.2.0-0_amd64.deb diff --git a/spec/models/fluentd_spec.rb b/spec/models/fluentd_spec.rb index e080c49..8581d2a 100644 --- a/spec/models/fluentd_spec.rb +++ b/spec/models/fluentd_spec.rb @@ -144,8 +144,6 @@ describe Fluentd do describe "#ensure_default_config_file" do subject do - skip "Circle CI file operations are unstable :(" if ENV["CIRCLECI"] - fluentd.config_file = config_file fluentd.save fluentd.config_file diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 78593a8..7364240 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,11 +1,6 @@ if ENV['RAILS_ENV'] == 'test' require 'simplecov' SimpleCov.start 'rails' - - if ENV['CIRCLE_ARTIFACTS'] # https://circleci.com/docs/code-coverage - dir = File.join("..", "..", "..", ENV['CIRCLE_ARTIFACTS'], "coverage") - SimpleCov.coverage_dir(dir) - end end # This file is copied to spec/ when you run 'rails generate rspec:install'