Skip to content

Commit d7e4d3e

Browse files
wip test just require false
1 parent 9aa80cf commit d7e4d3e

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

benchmarks/shipit/Gemfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ gem "sqlite3", ">= 2.1"
77
# Use the Puma web server [https://github.com/puma/puma]
88
gem "puma", ">= 5.0"
99

10+
# requiring sassc is broken on Ruby >= 4.1 due to a config change in rubygems
11+
# sassc is deprecated, and only here due to a transitive dependency anyway
12+
gem "sass-rails", require: false
13+
gem "sassc", require: false
14+
1015
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
1116
gem "tzinfo-data", platforms: %i[ windows jruby ]
1217

benchmarks/shipit/Gemfile.lock

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ PLATFORMS
385385
DEPENDENCIES
386386
puma (>= 5.0)
387387
rails (~> 8.0.2)
388+
sass-rails
389+
sassc
388390
shipit-engine (>= 0.40.0)
389391
sqlite3 (>= 2.1)
390392
tzinfo-data

benchmarks/shipit/benchmark.rb

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,6 @@
88

99
use_gemfile
1010

11-
# sassc uses FFI with hardcoded paths to find its compiled libsass shared object.
12-
# RubyGems 4.x (Ruby 4.1+) no longer copies extensions into the gem's lib/ tree,
13-
# so sassc can't find it. Copy it into place.
14-
if RUBY_VERSION >= "4.1"
15-
spec = Gem::Specification.find_by_name("sassc") rescue nil
16-
if spec
17-
dl_ext = RbConfig::MAKEFILE_CONFIG['DLEXT']
18-
target = File.join(spec.gem_dir, "ext", "libsass.#{dl_ext}")
19-
source = File.join(spec.extension_dir, "sassc", "libsass.#{dl_ext}")
20-
if !File.exist?(target) && File.exist?(source)
21-
require 'fileutils'
22-
FileUtils.cp(source, target)
23-
end
24-
end
25-
end
26-
2711
require 'securerandom'
2812
ENV['SECRET_KEY_BASE'] = SecureRandom.hex(128)
2913

0 commit comments

Comments
 (0)