Skip to content

Commit

Permalink
Fix bad merge on travis config
Browse files Browse the repository at this point in the history
  • Loading branch information
fatmcgav committed Nov 21, 2017
1 parent 37e77bd commit 7b7b3aa
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions .travis.yml
Expand Up @@ -15,9 +15,9 @@ before_install:
script: bundle exec rake $CHECK
sudo: false
env:
- PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes"
- PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
- PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes"
- PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test
- PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
- PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes" CHECK=test
matrix:
include:
- rvm: 2.1.9
Expand Down Expand Up @@ -64,11 +64,11 @@ matrix:
sudo: required
exclude:
- rvm: 1.9.3
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
- rvm: 1.9.3
env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes"
env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes" CHECK=test
- rvm: 2.3.1
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes"
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test
notifications:
email:
- fatmcgav@gmail.com
Expand Down

0 comments on commit 7b7b3aa

Please sign in to comment.