Skip to content

Commit e4d5c35

Browse files
committed
Add ruby 3.1 to 3.2 to spec integrations
Add `yaml-dev` in Dockerfile
1 parent e0d1d10 commit e4d5c35

File tree

3 files changed

+74
-4
lines changed

3 files changed

+74
-4
lines changed

.github/workflows/test.yml

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,51 @@ jobs:
3636
- ruby: '2.7'
3737
gemfile: gemfiles/rack_3_0.gemfile
3838
specs: 'spec/integration/rack_3_0'
39+
- ruby: '3.1'
40+
gemfile: gemfiles/grape_entity.gemfile
41+
specs: 'spec/integration/grape_entity'
42+
- ruby: '3.1'
43+
gemfile: gemfiles/hashie.gemfile
44+
specs: 'spec/integration/hashie'
45+
- ruby: '3.1'
46+
gemfile: gemfiles/dry_validation.gemfile
47+
specs: 'spec/integration/dry_validation'
48+
- ruby: '3.1'
49+
gemfile: gemfiles/rails_6_1.gemfile
50+
specs: 'spec/integration/rails'
51+
- ruby: '3.1'
52+
gemfile: gemfiles/rails_7_0.gemfile
53+
specs: 'spec/integration/rails'
54+
- ruby: '3.1'
55+
gemfile: gemfiles/rails_7_1.gemfile
56+
specs: 'spec/integration/rails'
57+
- ruby: '3.1'
58+
gemfile: gemfiles/rails_7_2.gemfile
59+
specs: 'spec/integration/rails'
60+
- ruby: '3.2'
61+
gemfile: gemfiles/grape_entity.gemfile
62+
specs: 'spec/integration/grape_entity'
63+
- ruby: '3.2'
64+
gemfile: gemfiles/hashie.gemfile
65+
specs: 'spec/integration/hashie'
66+
- ruby: '3.2'
67+
gemfile: gemfiles/dry_validation.gemfile
68+
specs: 'spec/integration/dry_validation'
69+
- ruby: '3.2'
70+
gemfile: gemfiles/rails_6_1.gemfile
71+
specs: 'spec/integration/rails'
72+
- ruby: '3.2'
73+
gemfile: gemfiles/rails_7_0.gemfile
74+
specs: 'spec/integration/rails'
75+
- ruby: '3.2'
76+
gemfile: gemfiles/rails_7_1.gemfile
77+
specs: 'spec/integration/rails'
78+
- ruby: '3.2'
79+
gemfile: gemfiles/rails_7_2.gemfile
80+
specs: 'spec/integration/rails'
81+
- ruby: '3.2'
82+
gemfile: gemfiles/rails_8_0.gemfile
83+
specs: 'spec/integration/rails'
3984
- ruby: '3.3'
4085
gemfile: gemfiles/grape_entity.gemfile
4186
specs: 'spec/integration/grape_entity'
@@ -60,6 +105,30 @@ jobs:
60105
- ruby: '3.3'
61106
gemfile: gemfiles/rails_8_0.gemfile
62107
specs: 'spec/integration/rails'
108+
- ruby: '3.4'
109+
gemfile: gemfiles/grape_entity.gemfile
110+
specs: 'spec/integration/grape_entity'
111+
- ruby: '3.4'
112+
gemfile: gemfiles/hashie.gemfile
113+
specs: 'spec/integration/hashie'
114+
- ruby: '3.4'
115+
gemfile: gemfiles/dry_validation.gemfile
116+
specs: 'spec/integration/dry_validation'
117+
- ruby: '3.4'
118+
gemfile: gemfiles/rails_6_1.gemfile
119+
specs: 'spec/integration/rails'
120+
- ruby: '3.4'
121+
gemfile: gemfiles/rails_7_0.gemfile
122+
specs: 'spec/integration/rails'
123+
- ruby: '3.4'
124+
gemfile: gemfiles/rails_7_1.gemfile
125+
specs: 'spec/integration/rails'
126+
- ruby: '3.4'
127+
gemfile: gemfiles/rails_7_2.gemfile
128+
specs: 'spec/integration/rails'
129+
- ruby: '3.4'
130+
gemfile: gemfiles/rails_8_0.gemfile
131+
specs: 'spec/integration/rails'
63132
exclude:
64133
- ruby: '2.7'
65134
gemfile: gemfiles/rails_7_2.gemfile

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV RUBYOPT --enable-frozen-string-literal --yjit
77
ENV LD_PRELOAD libjemalloc.so.2
88
ENV MALLOC_CONF dirty_decay_ms:1000,narenas:2,background_thread:true
99

10-
RUN apk add --update --no-cache make gcc git libc-dev gcompat jemalloc && \
10+
RUN apk add --update --no-cache make gcc git libc-dev yaml-dev gcompat jemalloc && \
1111
gem update --system && gem install bundler
1212

1313
WORKDIR $LIB_PATH

spec/integration/rails/mounting_spec.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
ActiveSupport::Dependencies.autoload_paths = []
1818
ActiveSupport::Dependencies.autoload_once_paths = []
1919

20-
Class.new(Rails::Application) do
20+
app = Class.new(Rails::Application) do
2121
config.eager_load = false
2222
config.load_defaults "#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}"
2323
config.api_only = true
@@ -28,15 +28,16 @@
2828
mount GrapeApi => '/'
2929

3030
get 'up', to: lambda { |_env|
31-
['200', {}, ['hello world']]
31+
[200, {}, ['hello world']]
3232
}
3333
end
3434
end
35+
app.initialize!
36+
Rack::Lint.new(app)
3537
end
3638

3739
before do
3840
stub_const('GrapeApi', api)
39-
app.initialize!
4041
end
4142

4243
it 'cascades' do

0 commit comments

Comments
 (0)