Skip to content

Commit

Permalink
Update rails versions for test
Browse files Browse the repository at this point in the history
  • Loading branch information
schneems committed Jan 12, 2021
1 parent 20bc233 commit 060bc44
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 38 deletions.
7 changes: 5 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,5 +67,8 @@ workflows:
- test:
matrix:
parameters:
ruby_version: ["2.5"]
gemfile: ["rails_6_0.gemfile"]
ruby_version: ["2.5", "2.7", "3.0"]
gemfile: ["rails_5_2.gemfile", "rails_6_1.gemfile", "rails_git.gemfile"]
exclude:
- ruby_version: "3.0"
gemfile: rails_5_2.gemfile
26 changes: 0 additions & 26 deletions Appraisals

This file was deleted.

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
## HEAD

- Minimum ruby version is now 2.5 (https://github.com/schneems/derailed_benchmarks/pull/183)
- Histograms are now printed side-by-side (https://github.com/schneems/derailed_benchmarks/pull/179)

## 1.8.1
Expand Down
5 changes: 1 addition & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,13 @@ A series of things you can use to benchmark a Rails or Ruby app.

## Compatibility/Requirements

This gem has been tested and is known to work with Rails 3.2+ using Ruby
2.2+. Some commands __may__ work on older versions of Ruby, but not all commands are supported.

For some benchmarks, not all, you'll need to verify you have a working version of curl on your OS:

```
$ which curl
/usr/bin/curl
$ curl -V
curl 7.37.1 #...
curl 7.64.1 #...
```

## Install
Expand Down
4 changes: 2 additions & 2 deletions derailed_benchmarks.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Gem::Specification.new do |gem|
gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
gem.require_paths = ["lib"]

gem.required_ruby_version = ">= 2.2.0"
gem.required_ruby_version = ">= 2.5.0"

gem.add_dependency "heapy", "~> 0"
gem.add_dependency "memory_profiler", ">= 0", "< 2"
Expand All @@ -32,9 +32,9 @@ Gem::Specification.new do |gem|
gem.add_dependency "ruby-statistics", ">= 2.1"
gem.add_dependency "mini_histogram", ">= 0.3.0"

gem.add_development_dependency "webrick", ">= 0"
gem.add_development_dependency "capybara", "~> 2"
gem.add_development_dependency "m"
gem.add_development_dependency "rails", "> 3", "<= 7"
gem.add_development_dependency "devise", "> 3", "< 6"
gem.add_development_dependency "appraisal", "2.2.0"
end
13 changes: 13 additions & 0 deletions gemfiles/rails_6_1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 6.1.1"

group :development, :test do
gem "sqlite3", platform: [:ruby, :mswin, :mingw]
gem "activerecord-jdbcsqlite3-adapter", "~> 1.3.13", platform: :jruby
gem "test-unit", "~> 3.0"
end

gemspec path: "../"
4 changes: 2 additions & 2 deletions gemfiles/rails_git.gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# frozen_string_literal: true

# $ BUNDLE_GEMFILE="$(pwd)/gemfiles/rails_git.gemfile" bundle exec m test/integration/tasks_test.rb:30
# $ BUNDLE_GEMFILE="$(pwd)/gemfiles/rails_git.gemfile" bundle exec m test/integration/tasks_test.rb:50

source "https://rubygems.org"

gem "rails", github: "rails/rails", ref: "3054e1d584e7eca110c69a1f8423f2e0866abbf9"
gem "rails", github: "rails/rails", ref: "12bb9d32f56883914abcd98fd72e3c68c444808d"

gem 'devise', github: "plataformatec/devise"

Expand Down
6 changes: 4 additions & 2 deletions test/integration/tasks_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ def rake(cmd, options = {})

skip unless ENV['USING_RAILS_GIT']

env = { "TEST_COUNT" => 2, "DERAILED_SCRIPT_COUNT" => 2, "SHAS_TO_TEST" => "3054e1d584e7eca110c69a1f8423f2e0866abbf9,80f989aecece1a2b1830e9c953e5887421b52d3c"}
env = { "TEST_COUNT" => 2, "DERAILED_SCRIPT_COUNT" => 2,
"SHAS_TO_TEST" => "acb6631cd99cdfe7db356773ef74cad7cbb570ed,12bb9d32f56883914abcd98fd72e3c68c444808d"}
puts rake "perf:library", { env: env }
end

Expand All @@ -58,7 +59,8 @@ def rake(cmd, options = {})
skip unless ENV['USING_RAILS_GIT']

error = assert_raises {
env = { "DERAILED_SCRIPT" => "nopenopenop", "TEST_COUNT" => 2, "DERAILED_SCRIPT_COUNT" => 2, "SHAS_TO_TEST" => "3054e1d584e7eca110c69a1f8423f2e0866abbf9,80f989aecece1a2b1830e9c953e5887421b52d3c"}
env = { "DERAILED_SCRIPT" => "nopenopenop", "TEST_COUNT" => 2, "DERAILED_SCRIPT_COUNT" => 2,
"SHAS_TO_TEST" => "acb6631cd99cdfe7db356773ef74cad7cbb570ed,12bb9d32f56883914abcd98fd72e3c68c444808d"}
puts rake "perf:library", { env: env }
}

Expand Down
Empty file.

0 comments on commit 060bc44

Please sign in to comment.