diff options
| author | John Keiser <jkeiser@opscode.com> | 2013-06-07 10:47:13 -0700 |
|---|---|---|
| committer | John Keiser <jkeiser@opscode.com> | 2013-06-07 10:47:13 -0700 |
| commit | 8d1ab0a0bb6a841e0c1e18b0b11417121fffe9c3 (patch) | |
| tree | 4143d240945a01567c004ea8974aada0308a55e5 | |
| parent | db34a35076c92e48c043814e8b26b91e55fd379c (diff) | |
| download | chef-zero-8d1ab0a0bb6a841e0c1e18b0b11417121fffe9c3.tar.gz | |
Allow jruby to start/stop server
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | gemfiles/gemfile.no-pedant | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index a591a92..64acf54 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,14 @@ matrix: include: - rvm: 1.8.7 env: SKIP_PEDANT=true + gemfile: gemfiles/gemfile.no-pedant - rvm: 1.9.3 - - rvm: 1.9.3 - gemfile: gemfiles/gemfile.latest-pedant - rvm: jruby-19mode env: SKIP_PEDANT=true + gemfile: gemfiles/gemfile.no-pedant - rvm: 2.0.0 allow_failures: + - rvm: 1.8.7 - rvm: jruby-19mode - - gemfile: gemfiles/gemfile.latest-pedant + - rvm: 1.9.3 + gemfile: gemfiles/gemfile.latest-pedant diff --git a/gemfiles/gemfile.no-pedant b/gemfiles/gemfile.no-pedant new file mode 100644 index 0000000..7784f18 --- /dev/null +++ b/gemfiles/gemfile.no-pedant @@ -0,0 +1,4 @@ +source 'https://rubygems.org' + +gemspec :path => "../" + |