diff --git a/.circleci/config.yml b/.circleci/config.yml index 4941b4ef..484f053a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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 @@ -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: diff --git a/.ruby-version b/.ruby-version index 316881c9..9e79f6c4 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.0.5 +ruby-3.2.2 diff --git a/Dockerfile b/Dockerfile index d57adea9..c27c32a9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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) \ diff --git a/Gemfile b/Gemfile index 9f6cfdb7..15302537 100644 --- a/Gemfile +++ b/Gemfile @@ -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 @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index edc779f0..13ed3b29 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -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) @@ -359,6 +365,8 @@ GEM PLATFORMS arm64-darwin-22 + x86_64-darwin-22 + x86_64-linux DEPENDENCIES bcrypt_pbkdf @@ -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) @@ -405,7 +413,7 @@ DEPENDENCIES webpacker RUBY VERSION - ruby 3.0.5p211 + ruby 3.2.2p53 BUNDLED WITH - 2.4.19 + 2.4.10 diff --git a/README.md b/README.md index 3caa564b..9ddab219 100644 --- a/README.md +++ b/README.md @@ -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 ``` diff --git a/config/application.rb b/config/application.rb index a04814f7..96b2d9ca 100644 --- a/config/application.rb +++ b/config/application.rb @@ -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 diff --git a/config/deploy.rb b/config/deploy.rb index d1a4ec34..38df7908 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -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 diff --git a/scripts/start-aaec.sh b/scripts/start-aaec.sh index 9cfc4061..ebefc293 100755 --- a/scripts/start-aaec.sh +++ b/scripts/start-aaec.sh @@ -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