drop ruby 1.9.3

Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
This commit is contained in:
Christoph Hartmann 2017-01-02 11:29:58 +01:00
parent 0dd6aa3e36
commit efc8542320
3 changed files with 15 additions and 23 deletions

View file

@ -9,48 +9,47 @@ services:
- docker - docker
bundler_args: "--without integration tools maintenance deploy" bundler_args: "--without integration tools maintenance deploy"
before_install: before_install:
- gem install bundler - gem update --system
- gem update --system 2.4.5 - gem update bundler
- gem --version - gem --version
matrix: matrix:
include: include:
- rvm: 1.9.3 - rvm: 2.1.10
- rvm: 2.1.8 - rvm: 2.2.6
- rvm: 2.2.5 - rvm: 2.3.3
- rvm: 2.3.1
script: bundle exec rake $SUITE script: bundle exec rake $SUITE
env: SUITE="lint test test:functional" env: SUITE="lint test test:functional"
- rvm: 2.3.1 - rvm: 2.3.3
script: bundle exec rake $SUITE script: bundle exec rake $SUITE
env: SUITE="test:resources config=test/test.yaml" N=2 env: SUITE="test:resources config=test/test.yaml" N=2
- rvm: 2.3.1 - rvm: 2.3.3
script: bundle exec rake $SUITE script: bundle exec rake $SUITE
env: SUITE="test:resources config=test/test-extra.yaml" N=2 env: SUITE="test:resources config=test/test-extra.yaml" N=2
- rvm: 2.3.1 - rvm: 2.3.3
bundler_args: "--without guard tools" bundler_args: "--without guard tools"
script: bundle exec rake $SUITE script: bundle exec rake $SUITE
env: SUITE=test:integration OS=default-ubuntu-1204 DOCKER=true env: SUITE=test:integration OS=default-ubuntu-1204 DOCKER=true
- rvm: 2.3.1 - rvm: 2.3.3
bundler_args: "--without guard tools" bundler_args: "--without guard tools"
script: bundle exec rake $SUITE script: bundle exec rake $SUITE
env: SUITE=test:integration OS='default-ubuntu-1604' DOCKER=true env: SUITE=test:integration OS='default-ubuntu-1604' DOCKER=true
- rvm: 2.3.1 - rvm: 2.3.3
bundler_args: "--without guard tools" bundler_args: "--without guard tools"
script: bundle exec rake $SUITE script: bundle exec rake $SUITE
env: SUITE=test:integration OS='default-centos-68' DOCKER=true env: SUITE=test:integration OS='default-centos-68' DOCKER=true
- rvm: 2.3.1 - rvm: 2.3.3
bundler_args: "--without guard tools" bundler_args: "--without guard tools"
script: bundle exec rake $SUITE script: bundle exec rake $SUITE
env: SUITE=test:integration OS='default-centos-7' DOCKER=true env: SUITE=test:integration OS='default-centos-7' DOCKER=true
- rvm: 2.3.1 - rvm: 2.3.3
bundler_args: "--without guard tools" bundler_args: "--without guard tools"
script: bundle exec rake $SUITE script: bundle exec rake $SUITE
env: SUITE=test:integration OS='default-debian-8' DOCKER=true env: SUITE=test:integration OS='default-debian-8' DOCKER=true
- rvm: 2.3.1 - rvm: 2.3.3
bundler_args: "--without guard tools" bundler_args: "--without guard tools"
script: bundle exec rake $SUITE script: bundle exec rake $SUITE
env: SUITE=test:integration OS='default-oracle-72' DOCKER=true env: SUITE=test:integration OS='default-oracle-72' DOCKER=true
- rvm: 2.3.1 - rvm: 2.3.3
bundler_args: "--without guard tools" bundler_args: "--without guard tools"
script: bundle exec rake $SUITE script: bundle exec rake $SUITE
env: SUITE=test:integration OS='default-fedora-24' DOCKER=true env: SUITE=test:integration OS='default-fedora-24' DOCKER=true

View file

@ -2,13 +2,6 @@
source 'https://rubygems.org' source 'https://rubygems.org'
gemspec gemspec
# pin dependency for Ruby 1.9.3 since bundler is not
# detecting that net-ssh 3 does not work with 1.9.3
if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
gem 'net-ssh', '~> 2.9'
gem 'tins', '~> 1.6.0'
end
if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2') if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
gem 'json', '~> 1.8' gem 'json', '~> 1.8'
gem 'rack', '< 2.0' gem 'rack', '< 2.0'

View file

@ -6,7 +6,7 @@ environment:
bundler_url: https://rubygems.org/downloads/bundler-1.9.9.gem bundler_url: https://rubygems.org/downloads/bundler-1.9.9.gem
matrix: matrix:
- ruby_version: "193" - ruby_version: "21"
- ruby_version: "22" - ruby_version: "22"
- ruby_version: "23" - ruby_version: "23"