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.

Sign up for GitHub

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

Jump to bottom

Upgrade rails to 6.1 and migrate nodejs to mini_racer #2093

Merged
merged 51 commits into from
Aug 11, 2021
Merged

Upgrade rails to 6.1 and migrate nodejs to mini_racer #2093

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
50eef54
Upgraded to rails 6.1.4
saghoshprogress Jul 22, 2021
a350a26
Omnibus Fix
saghoshprogress Jul 29, 2021
fe70427
Modified the gemlock
saghoshprogress Jul 29, 2021
dbe951a
Updfated the ruby js runtime
saghoshprogress Jul 29, 2021
6f3b534
Modified the all flag
saghoshprogress Jul 29, 2021
01e075e
Updated the Gemfile.lock
saghoshprogress Jul 30, 2021
0ac7da0
Fixed the omnibuc build
saghoshprogress Aug 2, 2021
7e05fa8
Upgraded to rails 6.1.4
saghoshprogress Jul 22, 2021
e8ab3b8
Omnibus Fix
saghoshprogress Jul 29, 2021
fc14057
Modified the gemlock
saghoshprogress Jul 29, 2021
ca8848c
Updfated the ruby js runtime
saghoshprogress Jul 29, 2021
e191dd7
Modified the all flag
saghoshprogress Jul 29, 2021
4f1586d
Updated the Gemfile.lock
saghoshprogress Jul 30, 2021
f634b06
Fixed the omnibuc build
saghoshprogress Aug 2, 2021
4d4ef4e
Update omnibus
tas50 Aug 4, 2021
a71e8b3
Pin chef and mini_racer
tas50 Aug 4, 2021
298f251
Rebase with master
saghoshprogress Aug 4, 2021
3f90a8a
Updated the ruby version
saghoshprogress Aug 4, 2021
4077d12
Fixed the gemfile lock conflicts
saghoshprogress Aug 4, 2021
ac66877
Updated gemfile lock
saghoshprogress Aug 4, 2021
0ee433d
Removed the nodejs installation
saghoshprogress Aug 4, 2021
cad9ba7
Modified the bundler version
saghoshprogress Aug 4, 2021
9ebf744
Added Barkshelf gem
saghoshprogress Aug 4, 2021
afbb3d2
removed the nodejs
saghoshprogress Aug 5, 2021
95cf68e
Updated the bundler version
saghoshprogress Aug 6, 2021
d5b917e
Added rubyracer
saghoshprogress Aug 6, 2021
f14f49e
Added rubyracer
saghoshprogress Aug 6, 2021
95a7ecc
Added rubyracer
saghoshprogress Aug 6, 2021
15e9a07
Updated for test
saghoshprogress Aug 9, 2021
4eff154
Update gem file
saghoshprogress Aug 9, 2021
ff127c8
Updated execjs
saghoshprogress Aug 9, 2021
da53ac9
Updated execjs
saghoshprogress Aug 9, 2021
59f53ba
Updated the env
saghoshprogress Aug 9, 2021
8c2c40a
Modified the code for nodejs
saghoshprogress Aug 9, 2021
0fc5c8b
Revert back the production.rb
saghoshprogress Aug 9, 2021
1a30943
Updated Gem file
saghoshprogress Aug 9, 2021
6299818
Updated the Gem files
saghoshprogress Aug 9, 2021
26daa99
bundle install with binstubs for supermarket-ctl
Aug 9, 2021
693f217
Updated the gem file
saghoshprogress Aug 9, 2021
8747451
Updated the Gem file
saghoshprogress Aug 9, 2021
d294339
Updated the Gem files
saghoshprogress Aug 9, 2021
0d4ee53
Updated the unsed codes
saghoshprogress Aug 10, 2021
ca75be1
Resolve the conflicts
saghoshprogress Aug 11, 2021
c329e68
Merge branch 'master' into saghoshprogress/rails_6_omnibus_fix
saghoshprogress Aug 11, 2021
bcadcfd
Updated the lint error
saghoshprogress Aug 11, 2021
d99716e
removed few unnecessary code
saghoshprogress Aug 11, 2021
48da9ed
Updated the lint errors
saghoshprogress Aug 11, 2021
955cb22
Updated the engile DB adaptar settings
saghoshprogress Aug 11, 2021
6aab8bc
Update omnibus/Gemfile
tas50 Aug 11, 2021
5cc29f2
Update omnibus/config/software/supermarket.rb
tas50 Aug 11, 2021
f363439
Update omnibus/config/software/supermarket.rb
tas50 Aug 11, 2021
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
3 changes: 2 additions & 1 deletion omnibus/config/projects/supermarket.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
build_iteration 1

override :postgresql, version: '9.3.25'
override :ruby, version: "2.6.7"
override :ruby, version: "2.7.4"
override :rubygems, version: "3.1.2" # rubygems ships its own bundler which may differ from bundler defined below and then we get double bundler which makes the omnibus environment unhappy. Make sure these versions match before bumping either.
override :bundler, version: "2.1.2" # this must match the BUNDLED WITH in all the repo's Gemfile.locks
override :'chef-gem', version: '14.14.29'
Expand Down Expand Up @@ -64,3 +64,4 @@
compression_level 1
compression_type :xz
end
{"mode":"full","isActive":false}
2 changes: 1 addition & 1 deletion omnibus/config/software/supermarket-ctl.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
build do
env = with_standard_compiler_flags(with_embedded_path)

bundle "install", env: env
#bundle "install", env: env

block do
erb source: "supermarket-ctl.erb",
Expand Down
11 changes: 8 additions & 3 deletions omnibus/config/software/supermarket.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
dependency "chef-gem"
dependency "git"
dependency "nginx"
dependency "nodejs"
# dependency "nodejs"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# dependency "nodejs"

dependency "postgresql"
dependency "redis"
dependency "ruby"
Expand All @@ -36,7 +36,11 @@
build do
env = with_standard_compiler_flags(with_embedded_path)

bundle "package --all --no-install"
if Bundler.feature_flag.cache_all?
bundle "package --no-install"
else
bundle "package --all --no-install"
end

bundle "install" \
" --jobs #{workers}" \
Expand All @@ -45,7 +49,8 @@
" --without development doc",
env: env
# This fails because we're installing Ruby C extensions in the wrong place!
bundle "exec rake assets:precompile", env: env.merge('RAILS_ENV' => 'production')
# bundle "exec rake assets:precompile", env: env.merge('RAILS_ENV' => 'production')
tas50 marked this conversation as resolved.
Show resolved Hide resolved
bundle "exec rake assets:precompile"

sync project_dir, "#{install_dir}/embedded/service/supermarket/",
exclude: %w( .cookbooks .direnv .envrc .env.* .gitignore .kitchen*
Expand Down
2 changes: 1 addition & 1 deletion src/supermarket/.ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.7
2.7.4
7 changes: 6 additions & 1 deletion src/supermarket/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source "https://rubygems.org"
# https://github.com/chef/omnibus-supermarket/blob/master/config/projects/supermarket.rb

gem "fieri", path: "engines/fieri"
gem "rails", "~> 5.2.6"
gem "rails", "~> 6.1.4"

gem "omniauth"
gem "omniauth-chef-oauth2"
Expand Down Expand Up @@ -56,6 +56,10 @@ gem "validate_url"
gem "virtus", "1.0.2", require: false # Pin to a version before the handling of nil in collection coercion was fixed.
gem "yajl-ruby"

gem 'mini_racer'
gem 'execjs'
gem 'listen'

group :doc do
gem "yard", require: false
end
Expand All @@ -78,6 +82,7 @@ group :test do
gem "shoulda-matchers"
gem "vcr", require: false
gem "webmock", require: false
gem "puma"
end

group :development, :test do
Expand Down
Loading