summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Schmitt <david.schmitt@puppet.com>2016-11-10 12:17:06 +0000
committerGitHub <noreply@github.com>2016-11-10 12:17:06 +0000
commitdfe0bf4706edb14cba7fe3b909378c336eb92045 (patch)
tree9915bb7f08d6aed0d3b7f1fe54d7b326beb5726f
parent4889eaa88d0f44f8c34c0e1ae4f6815fc92eb256 (diff)
parenta7a947c9773fee809a48f52aef30d431a04bab3f (diff)
Merge pull request #686 from HelenCampbell/whatever
Addition of 4.6 and 4.7 travis cells
-rw-r--r--.sync.yml9
-rw-r--r--.travis.yml6
2 files changed, 15 insertions, 0 deletions
diff --git a/.sync.yml b/.sync.yml
index d80d54a..34cfb5f 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -7,3 +7,12 @@
spec/spec_helper.rb:
allow_deprecations: true
+
+.travis.yml:
+ extras:
+   - rvm: 2.1.9
+     env: PUPPET_GEM_VERSION="~> 4.6.0"
+     bundler_args: --without system_tests
+   - rvm: 2.1.9
+     env: PUPPET_GEM_VERSION="~> 4.7.0"
+     bundler_args: --without system_tests
diff --git a/.travis.yml b/.travis.yml
index 4e549bf..0cde21d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,5 +34,11 @@ matrix:
- rvm: 1.9.3
bundler_args: --without system_tests
env: PUPPET_GEM_VERSION="~> 3.0"
+ - rvm: 2.1.9
+ bundler_args: --without system_tests
+ env: PUPPET_GEM_VERSION="~> 4.6.0"
+ - rvm: 2.1.9
+ bundler_args: --without system_tests
+ env: PUPPET_GEM_VERSION="~> 4.7.0"
notifications:
email: false