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

Add m1 support #234

Merged
merged 1 commit into from
Dec 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ PATH
mini_magick (~> 4.10, >= 4.10.1)
nested_form (~> 0.3.2)
nikkou (~> 0.0.5)
nokogiri (~> 1.11, >= 1.11.4)
nokogiri (>= 1.12.0)
oj (~> 3.10, >= 3.10.2)
oj_mimic_json (~> 1.0, >= 1.0.1)
pandoc-ruby (~> 2.0, >= 2.0.2)
Expand All @@ -66,7 +66,7 @@ PATH
retriable (~> 3.1)
ruby-progressbar (~> 1.10, >= 1.10.1)
rubyzip (~> 2)
sanitize (>= 5.1, < 5.3)
sanitize (~> 6.0.0)
sass-rails (~> 6)
simple_form (~> 5.0, >= 5.0.2)
staccato (~> 0.5.3)
Expand Down Expand Up @@ -458,10 +458,10 @@ GEM
nokogiri
tzinfo
nio4r (2.5.8)
nokogiri (1.13.9-arm64-darwin)
racc (~> 1.4)
nokogiri (1.13.9-x86_64-linux)
racc (~> 1.4)
nokogumbo (2.0.5)
nokogiri (~> 1.8, >= 1.8.4)
oauth2 (1.4.11)
faraday (>= 0.17.3, < 3.0)
jwt (>= 1.0, < 3.0)
Expand Down Expand Up @@ -621,10 +621,9 @@ GEM
fugit (~> 1.1, >= 1.1.6)
safe_attributes (1.0.10)
activerecord (>= 3.0.0)
sanitize (5.2.3)
sanitize (6.0.0)
crass (~> 1.0.2)
nokogiri (>= 1.8.0)
nokogumbo (~> 2.0)
nokogiri (>= 1.12.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
Expand Down Expand Up @@ -736,6 +735,7 @@ GEM
zeitwerk (2.6.0)

PLATFORMS
arm64-darwin-21
x86_64-linux

DEPENDENCIES
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ Other kinds of assets, like ERB views, images, stylesheets or javascript files,
overridden as easily as Ruby classes and modules, but you can always provide your own versions of
the same files, overwriting the ones provided by the engine.

You can run the rake task `lcms_engine:webpacker:compile` and set the environment variable `YARN_PATH` to set the yarn binary.

## Installation
Add this to the Gemfile:
```ruby
Expand Down
4 changes: 2 additions & 2 deletions lcms-engine.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ Gem::Specification.new do |s|
s.add_dependency 'mini_magick', '~> 4.10', '>= 4.10.1'
s.add_dependency 'nested_form', '~> 0.3.2'
s.add_dependency 'nikkou', '~> 0.0.5'
s.add_dependency 'nokogiri', '~> 1.11', '>= 1.11.4'
s.add_dependency 'nokogiri', '>= 1.12.0'
s.add_dependency 'oj', '~> 3.10', '>= 3.10.2'
s.add_dependency 'oj_mimic_json', '~> 1.0', '>= 1.0.1'
s.add_dependency 'pandoc-ruby', '~> 2.0', '>= 2.0.2'
Expand All @@ -82,7 +82,7 @@ Gem::Specification.new do |s|
s.add_dependency 'retriable', '~> 3.1'
s.add_dependency 'ruby-progressbar', '~> 1.10', '>= 1.10.1'
s.add_dependency 'rubyzip', '~> 2'
s.add_dependency 'sanitize', '>= 5.1', '< 5.3'
s.add_dependency 'sanitize', '~> 6.0.0'
s.add_dependency 'sass-rails', '~> 6'
s.add_dependency 'simple_form', '~> 5.0', '>= 5.0.2'
s.add_dependency 'staccato', '~> 0.5.3'
Expand Down
2 changes: 1 addition & 1 deletion lib/tasks/lcms/engine_tasks.rake
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ namespace :lcms_engine do # rubocop:disable Metrics/BlockLength
desc 'Install deps with yarn'
task :yarn_install do
Dir.chdir(File.join(__dir__, '../..')) do
system 'yarn install --no-progress --production'
system "#{ENV['YARN_PATH'] || 'yarn'} install --no-progress --production"
danielgatis marked this conversation as resolved.
Show resolved Hide resolved
end
end

Expand Down