diff options
author | tduehr <td@matasano.com> | 2016-04-19 12:48:38 -0500 |
---|---|---|
committer | tduehr <td@matasano.com> | 2016-04-19 12:48:38 -0500 |
commit | 993a916518af33d41f882525f07a7438aab2f4e4 (patch) | |
tree | 95222b8119699a70a0cd04ab8902aad908048d85 | |
parent | 8b406863445252f38a7e2c7b277a91aacc3fadc0 (diff) | |
parent | a1c306dbe6cfdfc57cbb9dc63799ca7f640576bc (diff) | |
download | ffi-993a916518af33d41f882525f07a7438aab2f4e4.tar.gz |
Merge pull request #495 from larskanis/update_ruby_2.3
Update for ruby-2.3 cross build and travis-ci
-rw-r--r-- | .travis.yml | 15 | ||||
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Rakefile | 2 | ||||
-rw-r--r-- | ffi.gemspec | 2 |
4 files changed, 15 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index ac176d6..e10cbc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,12 @@ +sudo: false +addons: + apt: + packages: + - libgmp-dev # this is needed for ruby-2.1.10 and ruby-head on linux language: ruby +before_install: + - gem install bundler script: bundle exec rake test -before_install: gem install bundler os: - linux - osx @@ -9,7 +15,8 @@ rvm: - "1.8.7" - "2.0.0" - "2.1" - - "2.2" + - "2.2.3" + - "2.3.0" - "ruby-head" - "rbx" - "system" @@ -20,10 +27,12 @@ matrix: allow_failures: - rvm: system - os: osx - rvm: "2.2" + rvm: "2.3.0" - os: osx rvm: ruby-head - rvm: "rbx" - rvm: "rbx-head" - rvm: "1.8.7" - rvm: "1.9.3" +after_failure: + - "find build -name mkmf.log | xargs cat" @@ -3,7 +3,7 @@ source 'https://rubygems.org' group :development do gem 'rake', '~> 10.1' gem 'rake-compiler', '~> 0.9.5' - gem 'rake-compiler-dock', '~> 0.4.0' + gem 'rake-compiler-dock', '~> 0.5.2' gem 'rspec', '~> 3.0' gem 'rubygems-tasks', '~> 0.2.4', :require => 'rubygems/tasks' gem "rubysl", "~> 2.0", :platforms => 'rbx' @@ -175,7 +175,7 @@ if USE_RAKE_COMPILER ext.cross_platform = %w[i386-mingw32 x64-mingw32] # forces the Windows platform instead of the default one end - ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3:2.0.0:2.1.6:2.2.2' + ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3:2.0.0:2.1.6:2.2.2:2.3.0' # To reduce the gem file size strip mingw32 dlls before packaging ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version| diff --git a/ffi.gemspec b/ffi.gemspec index 957d75b..dc191cf 100644 --- a/ffi.gemspec +++ b/ffi.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |s| s.required_ruby_version = '>= 1.8.7' s.add_development_dependency 'rake', '~> 10.1' s.add_development_dependency 'rake-compiler', '~> 0.9' - s.add_development_dependency 'rake-compiler-dock', '~> 0.4.0' + s.add_development_dependency 'rake-compiler-dock', '~> 0.5.2' s.add_development_dependency 'rspec', '~> 2.14.1' s.add_development_dependency 'rubygems-tasks', "~> 0.2.4" end |