Skip to content

Commit

Permalink
Dual boot to Rails 6 (#391)
Browse files Browse the repository at this point in the history 
* dual boot to rails 6

* Update replicas for staging canary to 1
  • Loading branch information
@yuenmichelle1
yuenmichelle1 authored Dec 26, 2024
1 parent 54bf61b commit 6937cc3
Show file tree
Hide file tree
Showing 3 changed files with 94 additions and 66 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ end
source 'https://rubygems.org'

if next?
gem 'rails', '5.2.8.1'
gem 'rails', '6.0.6.1'
else
gem 'rails', '5.2.8.1'
end
Expand Down
156 changes: 92 additions & 64 deletions Gemfile.next.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,50 +22,63 @@ GIT
GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.8.1)
actionpack (= 5.2.8.1)
actioncable (6.0.6.1)
actionpack (= 6.0.6.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.8.1)
actionpack (= 5.2.8.1)
actionview (= 5.2.8.1)
activejob (= 5.2.8.1)
actionmailbox (6.0.6.1)
actionpack (= 6.0.6.1)
activejob (= 6.0.6.1)
activerecord (= 6.0.6.1)
activestorage (= 6.0.6.1)
activesupport (= 6.0.6.1)
mail (>= 2.7.1)
actionmailer (6.0.6.1)
actionpack (= 6.0.6.1)
actionview (= 6.0.6.1)
activejob (= 6.0.6.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.8.1)
actionview (= 5.2.8.1)
activesupport (= 5.2.8.1)
actionpack (6.0.6.1)
actionview (= 6.0.6.1)
activesupport (= 6.0.6.1)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.8.1)
activesupport (= 5.2.8.1)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.6.1)
actionpack (= 6.0.6.1)
activerecord (= 6.0.6.1)
activestorage (= 6.0.6.1)
activesupport (= 6.0.6.1)
nokogiri (>= 1.8.5)
actionview (6.0.6.1)
activesupport (= 6.0.6.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.8.1)
activesupport (= 5.2.8.1)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.6.1)
activesupport (= 6.0.6.1)
globalid (>= 0.3.6)
activemodel (5.2.8.1)
activesupport (= 5.2.8.1)
activerecord (5.2.8.1)
activemodel (= 5.2.8.1)
activesupport (= 5.2.8.1)
arel (>= 9.0)
activestorage (5.2.8.1)
actionpack (= 5.2.8.1)
activerecord (= 5.2.8.1)
marcel (~> 1.0.0)
activesupport (5.2.8.1)
activemodel (6.0.6.1)
activesupport (= 6.0.6.1)
activerecord (6.0.6.1)
activemodel (= 6.0.6.1)
activesupport (= 6.0.6.1)
activestorage (6.0.6.1)
actionpack (= 6.0.6.1)
activejob (= 6.0.6.1)
activerecord (= 6.0.6.1)
marcel (~> 1.0)
activesupport (6.0.6.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.2, >= 2.2.2)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
arel (9.0.0)
aws-sdk (2.3.23)
aws-sdk-resources (= 2.3.23)
aws-sdk-core (2.3.23)
Expand All @@ -74,9 +87,10 @@ GEM
aws-sdk-core (= 2.3.23)
base64 (0.2.0)
benchmark-ips (2.14.0)
bigdecimal (3.1.8)
bigdecimal (3.1.9)
builder (3.3.0)
coderay (1.1.3)
colorize (1.1.0)
concurrent-ruby (1.3.4)
congestion (0.1.0)
connection_pool (>= 2.0)
Expand All @@ -89,6 +103,7 @@ GEM
date (3.4.1)
diff-lcs (1.5.1)
docile (1.4.1)
domain_name (0.6.20240107)
erubi (1.13.1)
et-orbi (1.2.11)
tzinfo
Expand Down Expand Up @@ -145,9 +160,11 @@ GEM
rspec (>= 2.99.0, < 4.0)
hashdiff (1.1.2)
honeybadger (4.5.6)
http-accept (1.7.0)
http-cookie (1.0.8)
domain_name (~> 0.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
its-it (1.3.0)
jmespath (1.6.2)
json-schema (2.8.1)
addressable (>= 2.4)
Expand All @@ -163,10 +180,10 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
key_struct (0.4.2)
listen (3.9.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
logger (1.6.4)
logstash-event (1.2.02)
logstasher (0.9.0)
activerecord (>= 3.0)
Expand All @@ -184,12 +201,15 @@ GEM
net-smtp
marcel (1.0.4)
method_source (1.1.0)
mime-types (3.6.0)
logger
mime-types-data (~> 3.2015)
mime-types-data (3.2024.1203)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitest (5.25.4)
mock_redis (0.41.0)
modware (0.1.3)
key_struct (~> 0.4)
modware (1.0.2)
multipart-post (2.4.1)
nenv (0.3.0)
net-imap (0.4.18)
Expand All @@ -201,6 +221,7 @@ GEM
timeout
net-smtp (0.5.0)
net-protocol
netrc (0.11.0)
newrelic_rpm (9.16.1)
nio4r (2.7.4)
nokogiri (1.15.7)
Expand All @@ -210,7 +231,7 @@ GEM
nenv (~> 0.1)
shellany (~> 0.0)
pg (0.21.0)
pry (0.15.0)
pry (0.15.2)
coderay (~> 1.1)
method_source (~> 1.0)
public_suffix (5.1.1)
Expand All @@ -228,18 +249,20 @@ GEM
rack (~> 2.2, >= 2.2.4)
rack-test (2.2.0)
rack (>= 1.3)
rails (5.2.8.1)
actioncable (= 5.2.8.1)
actionmailer (= 5.2.8.1)
actionpack (= 5.2.8.1)
actionview (= 5.2.8.1)
activejob (= 5.2.8.1)
activemodel (= 5.2.8.1)
activerecord (= 5.2.8.1)
activestorage (= 5.2.8.1)
activesupport (= 5.2.8.1)
rails (6.0.6.1)
actioncable (= 6.0.6.1)
actionmailbox (= 6.0.6.1)
actionmailer (= 6.0.6.1)
actionpack (= 6.0.6.1)
actiontext (= 6.0.6.1)
actionview (= 6.0.6.1)
activejob (= 6.0.6.1)
activemodel (= 6.0.6.1)
activerecord (= 6.0.6.1)
activestorage (= 6.0.6.1)
activesupport (= 6.0.6.1)
bundler (>= 1.3.0)
railties (= 5.2.8.1)
railties (= 6.0.6.1)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
Expand All @@ -248,20 +271,24 @@ GEM
rails-html-sanitizer (1.6.2)
loofah (~> 2.21)
nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
railties (5.2.8.1)
actionpack (= 5.2.8.1)
activesupport (= 5.2.8.1)
railties (6.0.6.1)
actionpack (= 6.0.6.1)
activesupport (= 6.0.6.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rainbow (3.0.0)
thor (>= 0.20.3, < 2.0)
rake (13.2.1)
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
redis (3.3.5)
request_store (1.7.0)
rack (>= 1.4)
rest-client (2.1.0)
http-accept (>= 1.7.0, < 2.0)
http-cookie (>= 1.0.2, < 2.0)
mime-types (>= 1.16, < 4.0)
netrc (~> 0.8)
rexml (3.4.0)
rspec (3.13.0)
rspec-core (~> 3.13.0)
Expand All @@ -288,17 +315,15 @@ GEM
rspec-support (~> 3.10)
rspec-support (3.13.2)
ruby2_keywords (0.0.5)
schema_monkey (2.1.6)
activerecord (>= 4.2)
modware (~> 0.1.0)
schema_plus_core (2.2.3)
activerecord (~> 5.0)
its-it (~> 1.2)
schema_monkey (~> 2.1)
schema_plus_indexes (0.3.1)
activerecord (>= 4.2, < 5.3)
its-it (~> 1.2)
schema_plus_core
schema_monkey (3.0.2)
activerecord (>= 5.2)
modware (~> 1.0.2)
schema_plus_core (3.1.0)
activerecord (>= 5.2, < 7.1)
schema_monkey (~> 3.0.2)
schema_plus_indexes (1.0.1)
activerecord (>= 5.2, < 7.1)
schema_plus_core (~> 3.1.0)
shellany (0.0.1)
sidekiq (5.2.9)
connection_pool (~> 2.2, >= 2.2.2)
Expand Down Expand Up @@ -327,9 +352,11 @@ GEM
actionpack (>= 5.2)
activesupport (>= 5.2)
sprockets (>= 3.0.0)
ten_years_rails (1.0.2)
actionview (~> 5.2.3)
rainbow (~> 3.0.0)
ten_years_rails (0.2.0)
actionview
activesupport
colorize (>= 0.8.1)
rest-client (>= 2.0.2)
thor (1.3.2)
thread_safe (0.3.6)
timecop (0.9.10)
Expand All @@ -343,6 +370,7 @@ GEM
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.6.18)
zoo_stream (1.0.1)
aws-sdk

Expand All @@ -369,7 +397,7 @@ DEPENDENCIES
puma
pundit (~> 1.1.0)
rack-cors (~> 1.0.5)
rails (= 5.2.8.1)
rails (= 6.0.6.1)
redis (~> 3.3.0)
restpack_serializer!
rspec-its
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/deployment-staging-canary.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
app: talk-staging-canary-app
spec:
replicas: 0
replicas: 1
selector:
matchLabels:
app: talk-staging-canary-app
Expand Down

0 comments on commit 6937cc3

Please sign in to comment.