Skip to content

Commit 0897d76

Browse files
authored
Stop excluding benchmarks from the Windows CI job (#568)
* Bump Rails to 8.1.4.1 lobsters, railsbench, shipit and activerecord move from Rails 8.1.1 (shipit 8.1.2) to 8.1.4.1. Action View 8.1.4.1 requires rails-html-sanitizer 1.7.2, which needs loofah 2.25.3, which needs nokogiri 1.19.5 or later, so those move too. * Run erubi-rails, lobsters and railsbench on Windows nokogiri 1.19.7 installs on Windows, so erubi-rails gets the same bump that lobsters and railsbench already have. lobsters skips stackprof on Windows, as railsbench does; it is only in the development group. * Run graphql-native on Windows graphql-c_parser 1.2.0 compiles on Windows, so graphql-native moves to it and the Windows job no longer excludes any benchmark.
1 parent 20cd348 commit 0897d76

4 files changed

Lines changed: 8 additions & 13 deletions

File tree

‎.github/workflows/test.yml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,6 @@ jobs:
187187
fail-fast: false
188188
matrix:
189189
ruby: [ruby, head]
190-
env:
191-
# erubi-rails, lobsters, railsbench: nokogiri 1.18.9 builds from source and its libiconv fails to compile
192-
# graphql-native: graphql-c_parser's FLOAT, INT and INPUT tokens clash with Windows headers
193-
# lobsters: stackprof fails to build
194-
EXCLUDES: erubi-rails,graphql-native,lobsters,railsbench
195190
if: ${{ github.event_name != 'schedule' || github.repository == 'ruby/ruby-bench' }}
196191
steps:
197192
- uses: actions/checkout@v3
@@ -201,7 +196,7 @@ jobs:
201196
ruby-version: ${{ matrix.ruby }}
202197

203198
- name: Test run_benchmarks.rb
204-
run: ruby run_benchmarks.rb --excludes=${{ env.EXCLUDES }}
199+
run: ruby run_benchmarks.rb
205200
env:
206201
WARMUP_ITRS: '1'
207202
MIN_BENCH_ITRS: '1'

‎benchmarks/erubi-rails/Gemfile.lock‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ GEM
107107
digest
108108
net-protocol
109109
timeout
110-
nokogiri (1.18.9)
110+
nokogiri (1.19.7)
111111
mini_portile2 (~> 2.8.2)
112112
racc (~> 1.4)
113-
nokogiri (1.18.9-x86_64-linux-gnu)
113+
nokogiri (1.19.7-x86_64-linux-gnu)
114114
racc (~> 1.4)
115115
pp (0.6.2)
116116
prettyprint
@@ -269,8 +269,8 @@ CHECKSUMS
269269
net-pop (0.1.2) sha256=848b4e982013c15b2f0382792268763b748cce91c9e91e36b0f27ed26420dff3
270270
net-protocol (0.2.2) sha256=aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8
271271
net-smtp (0.2.2) sha256=2487b00fa352d533512b57c79377e933163cf7a91201a8795822e8edab2b1231
272-
nokogiri (1.18.9) sha256=ac5a7d93fd0e3cef388800b037407890882413feccca79eb0272a2715a82fa33
273-
nokogiri (1.18.9-x86_64-linux-gnu) sha256=b52f5defedc53d14f71eeaaf990da66b077e1918a2e13088b6a96d0230f44360
272+
nokogiri (1.19.7) sha256=abe94507c54cb18f872777b16bdca4aad32b1abdc4c52fe843f1c80fbdf992b8
273+
nokogiri (1.19.7-x86_64-linux-gnu) sha256=25865ccb462f714e712fdf8906fde07849cb6704a808e3d629d75baa5af5dd3b
274274
pp (0.6.2) sha256=947ec3120c6f92195f8ee8aa25a7b2c5297bb106d83b41baa02983686577b6ff
275275
prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
276276
prism (1.9.0) sha256=7b530c6a9f92c24300014919c9dcbc055bf4cdf51ec30aed099b06cd6674ef85

‎benchmarks/graphql-native/Gemfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ GEM
77
base64
88
fiber-storage
99
logger
10-
graphql-c_parser (1.1.3)
10+
graphql-c_parser (1.2.0)
1111
graphql (>= 2.2.10)
1212
logger (1.7.0)
1313
racc (1.8.1)
@@ -27,7 +27,7 @@ CHECKSUMS
2727
bundler (4.0.12) sha256=7f8b757d28dfb636e7b24fba2344ac6dd13b5b24f4b46d62573d483f211825ac
2828
fiber-storage (1.0.1) sha256=f48e5b6d8b0be96dac486332b55cee82240057065dc761c1ea692b2e719240e1
2929
graphql (2.5.11) sha256=1169ffc6e215fd4d60056455b672c40a0cafa0607262049c2cca343b0f6bdb5c
30-
graphql-c_parser (1.1.3) sha256=a0a7e3221c091285ca03987de50ba8ad49846f66748b5fdd3780729482bbc358
30+
graphql-c_parser (1.2.0) sha256=8120ef0a06d3bd896d3dbcab8f553d4c4997d1b5c94a7d5d3b352176298294f9
3131
logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
3232
racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
3333

‎benchmarks/lobsters/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ group :development do
5353
gem 'flamegraph'
5454
gem 'memory_profiler'
5555
gem 'rack-mini-profiler'
56-
gem 'stackprof'
56+
gem 'stackprof', platforms: :mri
5757
end
5858

5959
gem "oauth" # for twitter-posting bot

0 commit comments

Comments
 (0)