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

Update Ruby to 3.2.2 for everything and Rails to 6.1.7.6 #174

Merged
merged 12 commits into from
Sep 7, 2023
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
8 changes: 6 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
build:
docker:
# specify the version you desire here
- image: cimg/ruby:3.0.5-browsers
- image: cimg/ruby:3.2.2

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
Expand All @@ -44,7 +44,11 @@ jobs:

steps:
- checkout
- browser-tools/install-chrome
- node/install:
node-version: "18.17.1"
# - browser-tools/install-chrome TODO: change the following 2 lines to this after fixing the orb issue #75.
- browser-tools/install-browser-tools:
chrome-version: 114.0.5735.90 # TODO: remove -> https://github.com/CircleCI-Public/browser-tools-orb/issues/75
- browser-tools/install-chromedriver

- restore_cache:
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.0.5
ruby-3.2.2
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM ruby:2.6.5
FROM ruby:3.2.2
# Install apt based dependencies required to run Rails as
# well as RubyGems. As the Ruby image itself is based on a
# Debian image, we use apt-get to install those.
RUN apt-get update && apt-get install -yqq --no-install-recommends build-essential zip unzip libpq-dev libaio1 libaio-dev nodejs

# install chrome (https://github.com/CircleCI-Public/circleci-dockerfiles/blob/master/ruby/images/2.6.5-stretch/browsers/Dockerfile)
# install chrome (https://github.com/CircleCI-Public/circleci-dockerfiles/blob/master/ruby/images/3.2.2-stretch/browsers/Dockerfile)

RUN curl --silent --show-error --location --fail --retry 3 --output /tmp/google-chrome-stable_current_amd64.deb https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb \
&& ( dpkg -i /tmp/google-chrome-stable_current_amd64.deb || apt-get -fy install) \
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '3.0.5'
ruby '3.2.2'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.1'
gem 'rails', '~> 6.1.7.6'
# gem 'sqlite3'

# Use Puma as the app server
Expand Down Expand Up @@ -83,7 +83,7 @@ group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'capybara-selenium', '~> 0.0.6'
gem 'selenium-webdriver', '>=4.11.0'
gem 'selenium-webdriver', '~> 4.12.0'
end

group :production do
Expand Down
30 changes: 19 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ GEM
airbrussh (1.4.2)
sshkit (>= 1.6.1, != 1.7.0)
ast (2.4.2)
autoprefixer-rails (10.4.13.0)
autoprefixer-rails (10.4.15.0)
execjs (~> 2)
base64 (0.1.1)
bcrypt_pbkdf (1.1.0)
Expand Down Expand Up @@ -139,8 +139,8 @@ GEM
factory_bot (~> 6.2.0)
railties (>= 5.0.0)
ffi (1.15.5)
globalid (1.1.0)
activesupport (>= 5.0)
globalid (1.2.1)
activesupport (>= 6.1)
htmlentities (4.3.4)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
Expand Down Expand Up @@ -168,7 +168,7 @@ GEM
matrix (0.4.2)
method_source (1.0.0)
mini_mime (1.1.5)
minitest (5.19.0)
minitest (5.20.0)
msgpack (1.7.2)
mysql2 (0.5.5)
net-imap (0.3.7)
Expand All @@ -186,6 +186,10 @@ GEM
nio4r (2.5.9)
nokogiri (1.15.4-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
pagy (3.11.0)
parallel (1.23.0)
parser (3.2.2.3)
Expand All @@ -196,7 +200,7 @@ GEM
puma (3.12.6)
racc (1.7.1)
rack (2.2.8)
rack-proxy (0.7.6)
rack-proxy (0.7.7)
rack
rack-test (2.1.0)
rack (>= 1.3)
Expand Down Expand Up @@ -294,7 +298,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
selenium-webdriver (4.11.0)
selenium-webdriver (4.12.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand All @@ -317,6 +321,8 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.6.4-arm64-darwin)
sqlite3 (1.6.4-x86_64-darwin)
sqlite3 (1.6.4-x86_64-linux)
sshkit (1.21.5)
net-scp (>= 1.1.2)
net-ssh (>= 2.8.0)
Expand All @@ -339,7 +345,7 @@ GEM
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
unicode-display_width (2.4.2)
web-console (4.2.0)
web-console (4.2.1)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
Expand All @@ -359,6 +365,8 @@ GEM

PLATFORMS
arm64-darwin-22
x86_64-darwin-22
x86_64-linux

DEPENDENCIES
bcrypt_pbkdf
Expand All @@ -385,14 +393,14 @@ DEPENDENCIES
net-smtp
pagy (~> 3.7)
puma (~> 3.12.4)
rails (~> 6.1)
rails (~> 6.1.7.6)
rails-controller-testing
rb-readline
rspec-rails
rspec_junit_formatter
rubocop
sass-rails (~> 5.0)
selenium-webdriver (>= 4.11.0)
selenium-webdriver (~> 4.12.0)
simplecov
spring
spring-watcher-listen (~> 2.0.0)
Expand All @@ -405,7 +413,7 @@ DEPENDENCIES
webpacker

RUBY VERSION
ruby 3.0.5p211
ruby 3.2.2p53

BUNDLED WITH
2.4.19
2.4.10
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ These instructions will get you a copy of the project up and running on your loc

## Prerequisites
```
Ruby Version 2.6.5
Ruby Version 3.2.2
SQLite 3
```

Expand Down
2 changes: 1 addition & 1 deletion config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
module Aaec
class Application < Rails::Application
# Initialize configuration defaults for originally generated Rails version.
config.load_defaults 6.0
config.load_defaults 6.1

# Settings in config/environments/* take precedence over those specified here.
# Application configuration can go into files in config/initializers
Expand Down
2 changes: 1 addition & 1 deletion config/deploy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
set :repo_url, 'https://github.com/uclibs/aaec.git'

set :rbenv_type, :user
set :rbenv_ruby, '3.0.4'
set :rbenv_ruby, '3.2.2'
# set :rbenv_ruby, File.read('.ruby-version').strip
set :rbenv_map_bins, %w[rake gem bundle ruby rails]
set :rbenv_roles, :all # default value
Expand Down
2 changes: 1 addition & 1 deletion scripts/start-aaec.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ MODE=$3 # production or development
if ! ( [ -f $APP_DIR/tmp/puma/pid ] && pgrep -F $APP_DIR/tmp/puma/pid > /dev/null )
then
cd $APP_DIR
export PATH=$APP_DIR/vendor/bundle/ruby/2.6.0/bin:/usr/local/bin:$PATH
export PATH=$APP_DIR/vendor/bundle/ruby/3.2.2/bin:/usr/local/bin:$PATH
export RAILS_ENV=$MODE
export RAILS_RELATIVE_URL_ROOT=$WEB_URI
bin/bundle exec puma -d
Expand Down