Commit f8fb4a80 by Tute Costa

Fix CI: use aws-sdk ~> 2.3.0

parent 9fc1ddae
...@@ -5,21 +5,13 @@ rvm: ...@@ -5,21 +5,13 @@ rvm:
script: "bundle exec rake clean spec cucumber" script: "bundle exec rake clean spec cucumber"
gemfile: gemfile:
- gemfiles/4.2.awsv2.0.gemfile - gemfiles/4.2.gemfile
- gemfiles/4.2.awsv2.1.gemfile - gemfiles/5.0.gemfile
- gemfiles/5.0.awsv2.0.gemfile
- gemfiles/5.0.awsv2.1.gemfile
matrix: matrix:
fast_finish: true fast_finish: true
exclude: exclude:
- gemfile: gemfiles/5.0.awsv2.0.gemfile - gemfile: gemfiles/5.0.gemfile
rvm: 2.0
- gemfile: gemfiles/5.0.awsv2.1.gemfile
rvm: 2.0
- gemfile: gemfiles/5.0.awsv2.0.gemfile
rvm: 2.1
- gemfile: gemfiles/5.0.awsv2.1.gemfile
rvm: 2.1 rvm: 2.1
sudo: false sudo: false
......
appraise "4.2.awsv2.3" do appraise "4.2" do
gem "rails", "~> 4.2.0" gem "rails", "~> 4.2.0"
gem "aws-sdk", "~> 2.3.0"
end end
appraise "5.0.awsv2.3" do appraise "5.0" do
gem "rails", "5.0.0.beta3" gem "rails", "~> 5.0.0"
gem "aws-sdk", "~> 2.3.0"
group :development, :test do
gem 'mime-types', '>= 1.16', '< 4'
end
end end
...@@ -592,7 +592,7 @@ You may also choose to store your files using Amazon's S3 service. To do so, inc ...@@ -592,7 +592,7 @@ You may also choose to store your files using Amazon's S3 service. To do so, inc
the `aws-sdk` gem in your Gemfile: the `aws-sdk` gem in your Gemfile:
```ruby ```ruby
gem 'aws-sdk', '>= 2.3.0' gem 'aws-sdk', '~> 2.3.0'
``` ```
And then you can specify using S3 from `has_attached_file`. And then you can specify using S3 from `has_attached_file`.
......
...@@ -5,7 +5,6 @@ source "https://rubygems.org" ...@@ -5,7 +5,6 @@ source "https://rubygems.org"
gem "sqlite3", "~> 1.3.8", :platforms => :ruby gem "sqlite3", "~> 1.3.8", :platforms => :ruby
gem "pry" gem "pry"
gem "rails", "~> 4.2.0" gem "rails", "~> 4.2.0"
gem "aws-sdk", "~> 2.3.0"
group :development, :test do group :development, :test do
gem "activerecord-import" gem "activerecord-import"
......
...@@ -3,16 +3,12 @@ ...@@ -3,16 +3,12 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "sqlite3", "~> 1.3.8", :platforms => :ruby gem "sqlite3", "~> 1.3.8", :platforms => :ruby
gem "jruby-openssl", :platforms => :jruby
gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
gem "rubysl", :platforms => :rbx
gem "racc", :platforms => :rbx
gem "pry" gem "pry"
gem "rails", "~> 5.0.0" gem "rails", "~> 5.0.0"
gem "aws-sdk", "~> 2.3"
group :development, :test do group :development, :test do
gem "mime-types", "~> 1.16" gem "activerecord-import"
gem "mime-types"
gem "builder" gem "builder"
gem "rubocop", :require => false gem "rubocop", :require => false
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment