Skip to content

Commit 71cf33a

Browse files
authored
Merge pull request #2246 from dblock/fix-ci
Fix CI
2 parents cf1e4e5 + 72dd21c commit 71cf33a

13 files changed

+16
-14
lines changed

.github/workflows/test.yml

+4-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ jobs:
3434
- gemfiles/rack1.gemfile
3535
- gemfiles/rack2.gemfile
3636
- gemfiles/rack2_2.gemfile
37-
- gemfiles/rack_edge.gemfile
3837
- gemfiles/rails_5.gemfile
3938
- gemfiles/rails_6.gemfile
4039
- gemfiles/rails_6_1.gemfile
@@ -69,7 +68,10 @@ jobs:
6968
experimental: false
7069
- ruby: 2.7
7170
gemfile: 'gemfiles/rails_edge.gemfile'
72-
experimental: false
71+
experimental: true
72+
- ruby: 2.7
73+
gemfile: 'gemfiles/rack_edge.gemfile'
74+
experimental: true
7375
- ruby: "ruby-head"
7476
experimental: true
7577
- ruby: "truffleruby-head"

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

gemfiles/multi_json.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

gemfiles/multi_xml.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

gemfiles/rack1.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

gemfiles/rack2.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

gemfiles/rack2_2.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

gemfiles/rack_edge.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

gemfiles/rails_5.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

gemfiles/rails_6.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

gemfiles/rails_6_1.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

gemfiles/rails_7.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

gemfiles/rails_edge.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ group :test do
3333
gem 'mime-types'
3434
gem 'rack-jsonp', require: 'rack/jsonp'
3535
gem 'rack-test', '~> 1.1.0'
36-
gem 'rspec', '~> 3.0'
36+
gem 'rspec', '~> 3.9.0'
3737
gem 'ruby-grape-danger', '~> 0.2.0', require: false
3838
gem 'test-prof', require: false
3939
end

0 commit comments

Comments
 (0)