Skip to content

Commit

Permalink
Upgrade to ruby 3.1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
mawise committed Aug 4, 2023
1 parent b746eed commit d70339b
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.6
3.1.4
6 changes: 4 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.7.6'
ruby '3.1.4'

# For configuration files
gem 'dotenv-rails', '2.7.6'
Expand All @@ -20,6 +20,8 @@ gem 'rb-readline'
# Image processing
gem 'image_processing', '~> 1.12.2'

gem 'rss', '~> 0.2.9'

# For Auth
gem 'devise', '~> 4.7.1'
gem 'bcrypt', '~> 3.1.16'
Expand All @@ -31,7 +33,7 @@ gem 'kaminari', '~> 1.2.1'
gem 'rails', '~> 6.1.7.4'
# Use sqlite3 as the database for Active Record
#gem 'sqlite3'
gem 'pg', '~> 1.1.4'
gem 'pg', '~> 1.2.3'
# Use Puma as the app server
gem 'puma', '~> 4.3.12'
# Use SCSS for stylesheets
Expand Down
18 changes: 8 additions & 10 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,9 @@ GEM
addressable (~> 2.8)
letter_opener (1.7.0)
launchy (~> 2.2)
listen (3.1.5)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
loofah (2.21.3)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
Expand All @@ -156,7 +155,6 @@ GEM
method_source (1.0.0)
mini_magick (4.12.0)
mini_mime (1.1.2)
mini_portile2 (2.8.4)
minitest (5.19.0)
msgpack (1.7.2)
net-imap (0.3.7)
Expand All @@ -169,11 +167,10 @@ GEM
net-smtp (0.3.3)
net-protocol
nio4r (2.5.9)
nokogiri (1.15.3)
mini_portile2 (~> 2.8.2)
nokogiri (1.15.3-x86_64-darwin)
racc (~> 1.4)
orm_adapter (0.5.0)
pg (1.1.4)
pg (1.2.3)
public_suffix (5.0.3)
puma (4.3.12)
nio4r (~> 2.0)
Expand Down Expand Up @@ -219,9 +216,9 @@ GEM
actionpack (>= 5.2)
railties (>= 5.2)
rexml (3.2.6)
rss (0.2.9)
ruby-vips (2.1.4)
ffi (~> 1.12)
ruby_dep (1.5.0)
rubyzip (2.3.2)
sass (3.7.4)
sass-listen (~> 4.0.0)
Expand Down Expand Up @@ -278,7 +275,7 @@ GEM
zeitwerk (2.6.9)

PLATFORMS
ruby
x86_64-darwin-20

DEPENDENCIES
aws-sdk-s3
Expand All @@ -295,10 +292,11 @@ DEPENDENCIES
kaminari (~> 1.2.1)
letter_opener (~> 1.7.0)
listen (>= 3.0.5, < 3.2)
pg (~> 1.1.4)
pg (~> 1.2.3)
puma (~> 4.3.12)
rails (~> 6.1.7.4)
rb-readline
rss (~> 0.2.9)
sass-rails (~> 5.0)
sassc (~> 2.4.0)
selenium-webdriver (~> 4.9.0)
Expand All @@ -310,7 +308,7 @@ DEPENDENCIES
webdrivers (~> 5.2)

RUBY VERSION
ruby 2.7.6p219
ruby 3.1.4p223

BUNDLED WITH
2.4.12
2 changes: 1 addition & 1 deletion deploymentscripts/deploy-aws.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
instance_type = 't3a.micro'
region = 'us-west-2'
az = 'us-west-2a'
ruby_version = "2.7.6"
ruby_version = "3.0.6"

## Parameter Parsing

Expand Down
4 changes: 2 additions & 2 deletions deploymentscripts/deploy-pi.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ echo 'eval "$(rbenv init -)"' >> ~/.bashrc
export PATH="$HOME/.rbenv/bin:$PATH"
eval "$(rbenv init -)"
git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
CONFIGURE_OPTS="--disable-install-doc" rbenv install 2.7.6 --verbose
rbenv global 2.7.6
CONFIGURE_OPTS="--disable-install-doc" rbenv install 3.0.6 --verbose
rbenv global 3.0.6
gem install bundler -v 2.4.12 --no-document

# NodeJS and Yarn
Expand Down
4 changes: 2 additions & 2 deletions deploymentscripts/lib/bash/ubuntu-prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ echo 'eval "$(rbenv init -)"' >> ~/.bashrc
export PATH="$HOME/.rbenv/bin:$PATH"
eval "$(rbenv init -)"
git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
RUBY_CONFIGURE_OPTS=--disable-install-doc rbenv install 2.7.6
rbenv global 2.7.6
RUBY_CONFIGURE_OPTS=--disable-install-doc rbenv install 3.0.6
rbenv global 3.0.6
gem install bundler -v 2.4.12 --no-document

#### Nginx And Passenger #### https://www.phusionpassenger.com/library/install/nginx/install/oss/bionic/
Expand Down
4 changes: 4 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
# yarn lockfile v1


0 comments on commit d70339b

Please sign in to comment.