Skip to content

Commit

Permalink
* fix tests for ruby 1.9 (it seams that bundle v1.7.6 ignores the --w…
Browse files Browse the repository at this point in the history
…ithout option)
  • Loading branch information
mkonietzny committed Jan 27, 2017
1 parent ebb6ac7 commit 9f0613d
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
20 changes: 9 additions & 11 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,29 @@ before_install:
- gem update bundler
- gem --version
- bundle -v
after_install:
- bundle exec gem list
script:
- 'bundle exec rake $CHECK'
matrix:
fast_finish: true
include:
- rvm: 1.9.3
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test SYSTEM_TESTS="no"
- rvm: 1.9.3
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test SYSTEM_TESTS="no"
- rvm: 2.1.9
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test SYSTEM_TESTS="no"
- rvm: 2.1.9
env: PUPPET_VERSION="~> 4.0" CHECK=test
env: PUPPET_VERSION="~> 4.0" CHECK=test SYSTEM_TESTS="no"
- rvm: 2.2.6
env: PUPPET_VERSION="~> 4.0" CHECK=test
env: PUPPET_VERSION="~> 4.0" CHECK=test SYSTEM_TESTS="no"
- rvm: 2.3.3
env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes SYSTEM_TESTS="no"
- rvm: 2.3.3
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
env: PUPPET_VERSION="~> 4.0" CHECK=rubocop SYSTEM_TESTS="no"
- rvm: 2.3.3
env: PUPPET_VERSION="~> 4.0" CHECK=test
env: PUPPET_VERSION="~> 4.0" CHECK=test SYSTEM_TESTS="no"
- rvm: 2.4.0
env: PUPPET_VERSION="~> 4.0" CHECK=test
env: PUPPET_VERSION="~> 4.0" CHECK=test SYSTEM_TESTS="no"
allow_failures:
- rvm: 2.4.0
branches:
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ group :development do
end

group :system_tests do
if RUBY_VERSION >= '2.0.0'
if ENV['SYSTEM_TESTS'] == 'yes'
if beaker_version = ENV['BEAKER_VERSION']
gem 'beaker', *location_for(beaker_version)
end
Expand Down

0 comments on commit 9f0613d

Please sign in to comment.