summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorJoseph Yaworski <joseph.yaworski@fireeye.com>2016-03-20 18:38:07 -0400
committerJoseph Yaworski <joseph.yaworski@fireeye.com>2016-03-20 18:51:58 -0400
commit7aa4c2a9e3107cc108448680d26b29ba63657b48 (patch)
tree59672a6d37db3519477ac363e69ece4642b52ef7 /.travis.yml
parentb740281e0cb8c3c87245a7698c0dbc849d6d66f4 (diff)
Update from voxpupuli modulesync_config
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml18
1 files changed, 14 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 115d3c4..1b492f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,14 +11,23 @@ matrix:
include:
- rvm: 1.9.3
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
- - rvm: 2.1.7
+ - rvm: 2.1.8
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
- - rvm: 2.1.7
+ - rvm: 1.9.3
+ env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test FUTURE_PARSER=yes
+ - rvm: 2.1.8
+ env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test FUTURE_PARSER=yes
+ - rvm: 2.1.8
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
- - rvm: 2.2.3
+ - rvm: 2.2.4
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
- - rvm: 2.2.3
+ - rvm: 2.2.4
env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=rubocop
+ - rvm: 2.3.0
+ env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
+ allow_failures:
+ - rvm: 2.3.0
+ env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes" CHECK=test
notifications:
email: false
deploy:
@@ -32,3 +41,4 @@ deploy:
all_branches: true
# Only publish if our main Ruby target builds
rvm: 1.9.3
+ condition: "$FUTURE_PARSER = yes"