Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix ci #1

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ end

group :development do
gem 'i18n-debug'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'listen', '~> 3.2'
gem 'rubocop'
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
Expand Down
28 changes: 13 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ GEM
regexp_parser (~> 1.5)
xpath (~> 3.2)
childprocess (3.0.0)
concurrent-ruby (1.1.6)
concurrent-ruby (1.1.7)
connection_pool (2.2.3)
crass (1.0.6)
declarative (0.0.10)
Expand Down Expand Up @@ -118,7 +118,7 @@ GEM
i18n (>= 1.6, < 2)
faraday (1.0.1)
multipart-post (>= 1.2, < 3)
ffi (1.12.2)
ffi (1.13.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
gon (6.3.2)
Expand All @@ -127,7 +127,7 @@ GEM
multi_json
request_store (>= 1.0)
hashie (4.1.0)
i18n (1.8.2)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
i18n-debug (1.2.0)
i18n (< 2)
Expand All @@ -137,11 +137,10 @@ GEM
railties (>= 4)
sprockets-rails
jwt (2.2.1)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.5.0)
listen (3.2.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
loofah (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
Expand All @@ -152,7 +151,7 @@ GEM
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.0)
minitest (5.14.2)
minitest-power_assert (0.3.1)
minitest
power_assert (>= 1.1)
Expand All @@ -161,7 +160,7 @@ GEM
multi_xml (0.6.0)
multipart-post (2.1.1)
nio4r (2.5.2)
nokogiri (1.10.9)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
oauth2 (1.4.4)
faraday (>= 0.8, < 2.0)
Expand Down Expand Up @@ -261,11 +260,10 @@ GEM
rack (>= 1.1)
rubocop (>= 0.72.0)
ruby-progressbar (1.10.1)
ruby_dep (1.5.0)
rubyzip (2.3.0)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.3.0)
sassc (2.4.0)
ffi (~> 1.9)
sassc-rails (2.1.2)
railties (>= 4.0.0)
Expand Down Expand Up @@ -295,7 +293,7 @@ GEM
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
spring (>= 1.2, < 3.0)
sprockets (4.0.0)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.1)
Expand Down Expand Up @@ -332,7 +330,7 @@ GEM
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.3.0)
zeitwerk (2.4.0)

PLATFORMS
ruby
Expand All @@ -354,7 +352,7 @@ DEPENDENCIES
i18n-debug
jbuilder (~> 2.7)
js-routes
listen (>= 3.0.5, < 3.2)
listen (~> 3.2)
minitest-power_assert
omniauth-github
pg
Expand Down
6 changes: 6 additions & 0 deletions config/initializers/assets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,9 @@
# application.js, application.css, and all non-JS/CSS in the app/assets
# folder are already added.
# Rails.application.config.assets.precompile += %w( admin.js admin.css )

# Workaround for Segfault
# https://github.com/sass/sassc-ruby/issues/197
Rails.application.config.assets.configure do |env|
env.export_concurrent = false
end
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
volumes:
- .:/app:cached
- '/tmp:/tmp'
- '/var/tmp/hexletbasics:/var/tmp/hexletbasics'
- '/var/tmp:/var/tmp'
- '/var/run/docker.sock:/var/run/docker.sock'
env_file: '.env'
depends_on:
Expand All @@ -29,7 +29,7 @@ services:
volumes:
- .:/app:cached
- '/tmp:/tmp'
- '/var/tmp/hexletbasics:/var/tmp/hexletbasics'
- '/var/tmp:/var/tmp'
- '/var/run/docker.sock:/var/run/docker.sock'
env_file: '.env'
depends_on:
Expand Down