Skip to content

Commit c7a7854

Browse files
Gyan-Gupta-RtslGyan-Gupta-Rtsl
authored
Revert "sc-15228" ruby update from 2.7.4 to 2.7.8 (#5672)
**Story card:** [sc-15228](https://app.shortcut.com/simpledotorg/story/15228/bump-ruby-to-2-7-latest)
1 parent ca9bb65 commit c7a7854

File tree

10 files changed

+71
-74
lines changed

10 files changed

+71
-74
lines changed

‎.docker/config/nginx/webapp.conf‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ server {
88
gzip_types text/html text/plain application/json;
99

1010
passenger_user app;
11-
passenger_ruby /usr/bin/ruby;
12-
passenger_app_root /home/app;
11+
passenger_ruby /usr/bin/ruby2.7;
1312
passenger_enabled on;
1413
passenger_app_env production;
1514
passenger_start_timeout 300;

‎.docker/dev.Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Dockerfile development version
2-
FROM ruby:2.7.8
2+
FROM ruby:2.7.4
33

4-
ENV BUNDLE_VERSION 2.4.22
4+
ENV BUNDLE_VERSION 2.3.22
55
ENV EDITOR vim
66

77
## Install dependencies

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.7.8
1+
2.7.4

‎.semaphore/semaphore.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ blocks:
1616
jobs:
1717
- name: Cache everything
1818
commands:
19-
- sem-version ruby 2.7.8
19+
- sem-version ruby 2.7.4
2020
- checkout
2121
# - cache clear
2222
- cache restore

‎Gemfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
source "https://rubygems.org"
2-
ruby "2.7.8"
2+
ruby "2.7.4"
33

44
git_source(:github) do |repo_name|
55
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
66
"https://github.com/#{repo_name}.git"
77
end
88

99
gem "dotenv-rails"
10-
gem "rails", "6.1.7.10"
10+
gem "rails", "~> 6"
1111
gem "active_hash", "~> 2.3.0"
1212
gem "active_record_union"
1313
gem "activerecord-import"

‎Gemfile.lock‎

Lines changed: 58 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (6.1.7.10)
5-
actionpack (= 6.1.7.10)
6-
activesupport (= 6.1.7.10)
4+
actioncable (6.1.6.1)
5+
actionpack (= 6.1.6.1)
6+
activesupport (= 6.1.6.1)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
9-
actionmailbox (6.1.7.10)
10-
actionpack (= 6.1.7.10)
11-
activejob (= 6.1.7.10)
12-
activerecord (= 6.1.7.10)
13-
activestorage (= 6.1.7.10)
14-
activesupport (= 6.1.7.10)
9+
actionmailbox (6.1.6.1)
10+
actionpack (= 6.1.6.1)
11+
activejob (= 6.1.6.1)
12+
activerecord (= 6.1.6.1)
13+
activestorage (= 6.1.6.1)
14+
activesupport (= 6.1.6.1)
1515
mail (>= 2.7.1)
16-
actionmailer (6.1.7.10)
17-
actionpack (= 6.1.7.10)
18-
actionview (= 6.1.7.10)
19-
activejob (= 6.1.7.10)
20-
activesupport (= 6.1.7.10)
16+
actionmailer (6.1.6.1)
17+
actionpack (= 6.1.6.1)
18+
actionview (= 6.1.6.1)
19+
activejob (= 6.1.6.1)
20+
activesupport (= 6.1.6.1)
2121
mail (~> 2.5, >= 2.5.4)
2222
rails-dom-testing (~> 2.0)
23-
actionpack (6.1.7.10)
24-
actionview (= 6.1.7.10)
25-
activesupport (= 6.1.7.10)
23+
actionpack (6.1.6.1)
24+
actionview (= 6.1.6.1)
25+
activesupport (= 6.1.6.1)
2626
rack (~> 2.0, >= 2.0.9)
2727
rack-test (>= 0.6.3)
2828
rails-dom-testing (~> 2.0)
2929
rails-html-sanitizer (~> 1.0, >= 1.2.0)
30-
actiontext (6.1.7.10)
31-
actionpack (= 6.1.7.10)
32-
activerecord (= 6.1.7.10)
33-
activestorage (= 6.1.7.10)
34-
activesupport (= 6.1.7.10)
30+
actiontext (6.1.6.1)
31+
actionpack (= 6.1.6.1)
32+
activerecord (= 6.1.6.1)
33+
activestorage (= 6.1.6.1)
34+
activesupport (= 6.1.6.1)
3535
nokogiri (>= 1.8.5)
36-
actionview (6.1.7.10)
37-
activesupport (= 6.1.7.10)
36+
actionview (6.1.6.1)
37+
activesupport (= 6.1.6.1)
3838
builder (~> 3.1)
3939
erubi (~> 1.4)
4040
rails-dom-testing (~> 2.0)
@@ -44,24 +44,24 @@ GEM
4444
active_record_query_trace (1.8)
4545
active_record_union (1.3.0)
4646
activerecord (>= 4.0)
47-
activejob (6.1.7.10)
48-
activesupport (= 6.1.7.10)
47+
activejob (6.1.6.1)
48+
activesupport (= 6.1.6.1)
4949
globalid (>= 0.3.6)
50-
activemodel (6.1.7.10)
51-
activesupport (= 6.1.7.10)
52-
activerecord (6.1.7.10)
53-
activemodel (= 6.1.7.10)
54-
activesupport (= 6.1.7.10)
50+
activemodel (6.1.6.1)
51+
activesupport (= 6.1.6.1)
52+
activerecord (6.1.6.1)
53+
activemodel (= 6.1.6.1)
54+
activesupport (= 6.1.6.1)
5555
activerecord-import (1.4.0)
5656
activerecord (>= 4.2)
57-
activestorage (6.1.7.10)
58-
actionpack (= 6.1.7.10)
59-
activejob (= 6.1.7.10)
60-
activerecord (= 6.1.7.10)
61-
activesupport (= 6.1.7.10)
57+
activestorage (6.1.6.1)
58+
actionpack (= 6.1.6.1)
59+
activejob (= 6.1.6.1)
60+
activerecord (= 6.1.6.1)
61+
activesupport (= 6.1.6.1)
6262
marcel (~> 1.0)
6363
mini_mime (>= 1.1.0)
64-
activesupport (6.1.7.10)
64+
activesupport (6.1.6.1)
6565
concurrent-ruby (~> 1.0, >= 1.0.2)
6666
i18n (>= 1.6, < 2)
6767
minitest (>= 5.1)
@@ -77,7 +77,6 @@ GEM
7777
activerecord (>= 4.0)
7878
autoprefixer-rails (10.4.7.0)
7979
execjs (~> 2)
80-
base64 (0.2.0)
8180
bcp47 (0.3.3)
8281
i18n
8382
bcrypt (3.1.18)
@@ -353,7 +352,7 @@ GEM
353352
lumberjack (1.2.8)
354353
mail (2.7.1)
355354
mini_mime (>= 0.1.1)
356-
marcel (1.0.4)
355+
marcel (1.0.2)
357356
matrix (0.4.2)
358357
memery (1.4.1)
359358
ruby2_keywords (~> 0.0.2)
@@ -437,20 +436,20 @@ GEM
437436
rack
438437
rack-test (2.1.0)
439438
rack (>= 1.3)
440-
rails (6.1.7.10)
441-
actioncable (= 6.1.7.10)
442-
actionmailbox (= 6.1.7.10)
443-
actionmailer (= 6.1.7.10)
444-
actionpack (= 6.1.7.10)
445-
actiontext (= 6.1.7.10)
446-
actionview (= 6.1.7.10)
447-
activejob (= 6.1.7.10)
448-
activemodel (= 6.1.7.10)
449-
activerecord (= 6.1.7.10)
450-
activestorage (= 6.1.7.10)
451-
activesupport (= 6.1.7.10)
439+
rails (6.1.6.1)
440+
actioncable (= 6.1.6.1)
441+
actionmailbox (= 6.1.6.1)
442+
actionmailer (= 6.1.6.1)
443+
actionpack (= 6.1.6.1)
444+
actiontext (= 6.1.6.1)
445+
actionview (= 6.1.6.1)
446+
activejob (= 6.1.6.1)
447+
activemodel (= 6.1.6.1)
448+
activerecord (= 6.1.6.1)
449+
activestorage (= 6.1.6.1)
450+
activesupport (= 6.1.6.1)
452451
bundler (>= 1.15.0)
453-
railties (= 6.1.7.10)
452+
railties (= 6.1.6.1)
454453
sprockets-rails (>= 2.0.0)
455454
rails-controller-testing (1.0.5)
456455
actionpack (>= 5.0.1.rc1)
@@ -466,9 +465,9 @@ GEM
466465
ruby-graphviz (~> 1.2)
467466
rails-html-sanitizer (1.4.3)
468467
loofah (~> 2.3)
469-
railties (6.1.7.10)
470-
actionpack (= 6.1.7.10)
471-
activesupport (= 6.1.7.10)
468+
railties (6.1.6.1)
469+
actionpack (= 6.1.6.1)
470+
activesupport (= 6.1.6.1)
472471
method_source
473472
rake (>= 12.2)
474473
thor (~> 1.0)
@@ -678,8 +677,7 @@ GEM
678677
semantic_range (>= 2.3.0)
679678
webrick (1.9.1)
680679
websocket (1.2.10)
681-
websocket-driver (0.7.7)
682-
base64
680+
websocket-driver (0.7.5)
683681
websocket-extensions (>= 0.1.0)
684682
websocket-extensions (0.1.5)
685683
whenever (1.0.0)
@@ -778,7 +776,7 @@ DEPENDENCIES
778776
puma
779777
rack-attack
780778
rack-mini-profiler
781-
rails (= 6.1.7.10)
779+
rails (~> 6)
782780
rails-controller-testing
783781
rails-erd
784782
rb-readline
@@ -829,7 +827,7 @@ DEPENDENCIES
829827
zip_kit
830828

831829
RUBY VERSION
832-
ruby 2.7.8p225
830+
ruby 2.7.4p191
833831

834832
BUNDLED WITH
835-
2.4.22
833+
2.3.22

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,13 +107,13 @@ bin/docker-down
107107
If the included `bin/setup` script fails for some reason, you can also manually
108108
set up the application step by step. You can do so as follows.
109109

110-
First, you need to [install ruby](https://www.ruby-lang.org/en/documentation/installation). It is recommended to use [rbenv](https://github.com/rbenv/rbenv) to manage ruby versions. Note that we currently use Bundler version 2.4.22, so that is also hardcoded below.
110+
First, you need to [install ruby](https://www.ruby-lang.org/en/documentation/installation). It is recommended to use [rbenv](https://github.com/rbenv/rbenv) to manage ruby versions. Note that we currently use Bundler version 2.3.22, so that is also hardcoded below.
111111

112112
Next, [install NodeJS v18.11.0](https://nodejs.org/en/) using [nvm](https://github.com/nvm-sh/nvm).
113113

114114
```bash
115-
gem install bundler -v 2.4.22
116-
bundle _2.4.22_ install
115+
gem install bundler -v 2.3.22
116+
bundle _2.3.22_ install
117117
brew install nvm
118118
nvm install 18.11.0
119119
rake yarn:install

‎bin/setup‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
RUBY_VERSION=$(cat .ruby-version)
66
} > /dev/null 2>&1
77

8-
BUNDLER_VERSION=2.4.22
8+
BUNDLER_VERSION=2.3.22
99

1010
init (){
1111
verify_ruby_version && verify_node_version

‎script/semaphore_deploy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ echo "Beginning deploy of $SEMAPHORE_GIT_SHA to $deploy_target..."
1717
source ~/.toolbox/toolbox
1818

1919
export DD_PROFILING_NO_EXTENSION=true
20-
sem-version ruby 2.7.8
20+
sem-version ruby 2.7.4
2121
cache restore
2222
yarn install
2323
bundle config set deployment 'true'

‎script/semaphore_setup‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ source ~/.toolbox/toolbox
88
cache clear
99

1010
export DD_PROFILING_NO_EXTENSION=true
11-
sem-version ruby 2.7.8
11+
sem-version ruby 2.7.4
1212
sem-service start postgres 14
1313
sem-service start redis 5
1414

0 commit comments

Comments
 (0)