Skip to content

Commit ff38ebf

Browse files
author
David Kang
committed
Update sassc gem and disable concurrency for precompile assets
Concurrency are raising failure during the precompile. There is an issue on sprocket related to this issue rails/sprockets#581 and sass/sassc-ruby#138.
1 parent a6cf72d commit ff38ebf

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

dist/obs-bundled-gems.spec

+1
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ mkdir -p vendor/cache
100100
cp %{_sourcedir}/vendor/cache/*.gem vendor/cache
101101
export GEM_HOME=~/.gems
102102
bundle config build.nokogiri --use-system-libraries
103+
bundle config build.sassc --disable-march-tune-native
103104

104105
%install
105106
bundle --local --path %{buildroot}%_libdir/obs-api/

src/api/Gemfile.lock

+3-4
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ GEM
157157
tty-screen (~> 0.6.5)
158158
tty-tree (~> 0.3.0)
159159
feature (1.4.0)
160-
ffi (1.11.1)
160+
ffi (1.12.2)
161161
flot-rails (0.0.7)
162162
jquery-rails
163163
font-awesome-sass (5.8.1)
@@ -387,9 +387,8 @@ GEM
387387
crass (~> 1.0.2)
388388
nokogiri (>= 1.8.0)
389389
nokogumbo (~> 2.0)
390-
sassc (2.0.1)
390+
sassc (2.2.1)
391391
ffi (~> 1.9)
392-
rake
393392
sassc-rails (2.1.2)
394393
railties (>= 4.0.0)
395394
sassc (>= 2.0)
@@ -439,7 +438,7 @@ GEM
439438
riddle (~> 2.3)
440439
thor (0.20.3)
441440
thread_safe (0.3.6)
442-
tilt (2.0.9)
441+
tilt (2.0.10)
443442
timecop (0.9.1)
444443
tins (1.20.3)
445444
tty-color (0.5.0)

src/api/config/initializers/assets.rb

+5
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,8 @@
99
# Precompile additional assets.
1010
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
1111
Rails.application.config.assets.precompile += ['webui2/webui2.css', 'webui2/application.js', 'webui/obs_factory/application.css', 'webui2/cm2/*.js']
12+
13+
# FIXME: Precompile are not thread safe
14+
Rails.application.config.assets.configure do |env|
15+
env.export_concurrent = false
16+
end

0 commit comments

Comments
 (0)