Commit 470fff5f authored by Greg Williams's avatar Greg Williams
Browse files

Updated to use travis.rb gem instead of travis-lint, since it has more... 

Updated to use travis.rb gem instead of travis-lint, since it has more goodies, but had to append --skip-version-check option to get it to work?
parent 09193667

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ rvm: 
  - "1.9.3"

  - "2.0.0"

install:

  - ruby ./config/travis_install.rb

  - bundle install

  - bundle exec ruby ./config/travis_install.rb

script:

  - bundle exec rake verbose ci

Gemfile

+1 −1
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ gem 'bundler', '>= 1.3.5' 
gem 'ceedling', '>= 0.15'



group :development do

  gem 'travis-lint'

  gem 'travis'

end

Gemfile.lock

+48 −3
Original line number Diff line number Diff line 
GEM

  remote: http://rubygems.org/

  specs:

    addressable (2.3.6)

    backports (3.6.0)

    ceedling (0.15.1)

      rake (>= 0.8.7)

      thor (>= 0.14.5)

    coderay (1.1.0)

    ethon (0.7.1)

      ffi (>= 1.3.0)

    faraday (0.9.0)

      multipart-post (>= 1.2, < 3)

    faraday_middleware (0.9.1)

      faraday (>= 0.7.4, < 0.10)

    ffi (1.9.3)

    gh (0.13.2)

      addressable

      backports

      faraday (~> 0.8)

      multi_json (~> 1.0)

      net-http-persistent (>= 2.7)

      net-http-pipeline

    highline (1.6.21)

    json (1.8.1)

    launchy (2.4.2)

      addressable (~> 2.3)

    method_source (0.8.2)

    multi_json (1.10.1)

    multipart-post (2.0.0)

    net-http-persistent (2.9.4)

    net-http-pipeline (1.0.1)

    pry (0.9.12.6)

      coderay (~> 1.0)

      method_source (~> 0.8)

      slop (~> 3.4)

    pusher-client (0.6.0)

      json

      websocket (~> 1.0)

    rake (10.3.2)

    slop (3.6.0)

    thor (0.19.1)

    travis-lint (2.0.0)

      json

    travis (1.6.15.1)

      addressable (~> 2.3)

      backports

      faraday (~> 0.9)

      faraday_middleware (~> 0.9, >= 0.9.1)

      gh (~> 0.13)

      highline (~> 1.6)

      launchy (~> 2.1)

      pry (~> 0.9, < 0.10)

      pusher-client (~> 0.4)

      typhoeus (~> 0.6, >= 0.6.8)

    typhoeus (0.6.9)

      ethon (>= 0.7.1)

    websocket (1.1.4)



PLATFORMS

  ruby
@@ -16,4 +61,4 @@ PLATFORMS 
DEPENDENCIES

  bundler (>= 1.3.5)

  ceedling (>= 0.15)

  travis-lint
 
  travis

Rakefile

+3 −3
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ end 
desc "Validate .travis.yml config file"

namespace :travis do

  task :validate do

    execute_command "travis-lint", "Validating Travis CI Configuration"

    execute_command "travis lint --skip-version-check", "Validating Travis CI Configuration"

  end

end
@@ -241,13 +241,13 @@ task :all => [ 
  'cppcheck',

  'default',

  'run',

  #'travis:validate'

  'travis:validate'

]



desc "Run full CI build"

task :ci => [

  'clobber',

  'verbose', # uncomment to enable verbose output for CI builds

  # 'verbose', # uncomment to enable verbose output for CI builds

  'all'

]