* tell NOKOGIRI to use system libraries in build environment

This commit is contained in:
Seth Call 2014-01-26 14:46:11 -06:00
parent 8cf8e7ae1d
commit 8f5a2a6369
4 changed files with 13 additions and 7 deletions

View File

@ -11,6 +11,7 @@ else
gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}"
gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}"
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
end end
gem 'rails' gem 'rails'

View File

@ -6,6 +6,15 @@ end
devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable
if devenv
gem 'jam_db', :path=> "../db/target/ruby_package"
gem 'jampb', :path => "../pb/target/ruby/jampb"
else
gem 'jam_db'
gem 'jampb'
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
end
gem 'pg', '0.15.1', :platform => [:mri, :mswin, :mingw] gem 'pg', '0.15.1', :platform => [:mri, :mswin, :mingw]
gem 'jdbc_postgres', :platform => [:jruby] gem 'jdbc_postgres', :platform => [:jruby]
@ -33,13 +42,7 @@ gem 'resque-lonely_job', '~> 1.0.0'
gem 'oj' gem 'oj'
gem 'builder' gem 'builder'
if devenv
gem 'jam_db', :path=> "../db/target/ruby_package"
gem 'jampb', :path => "../pb/target/ruby/jampb"
else
gem 'jam_db'
gem 'jampb'
end
group :test do group :test do
gem "factory_girl", '4.1.0' gem "factory_girl", '4.1.0'

View File

@ -17,6 +17,7 @@ else
gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}"
gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}"
gem 'jam_websockets', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jam_websockets', "0.1.#{ENV["BUILD_NUMBER"]}"
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
end end
gem 'builder' gem 'builder'
gem 'rails', '>=3.2.11' gem 'rails', '>=3.2.11'

View File

@ -15,6 +15,7 @@ else
gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jam_db', "0.1.#{ENV["BUILD_NUMBER"]}"
gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jampb', "0.1.#{ENV["BUILD_NUMBER"]}"
gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}" gem 'jam_ruby', "0.1.#{ENV["BUILD_NUMBER"]}"
ENV['NOKOGIRI_USE_SYSTEM_LIBRARIES'] ||= "true"
end end