From bbcdec4d374e1a44ca6f2e2286143d4f0f8c14dd Mon Sep 17 00:00:00 2001 From: Janell-Huyck Date: Tue, 5 Sep 2023 17:04:46 -0400 Subject: [PATCH 01/11] Update Ruby to 3.2.2 for everything and Rails to 6.1.7.6 --- .circleci/config.yml | 2 +- .ruby-version | 2 +- Dockerfile | 4 +- Gemfile | 7 +- Gemfile.lock | 256 +++++++++++++++++++++--------------------- README.md | 2 +- config/application.rb | 2 +- config/deploy.rb | 2 +- scripts/start-aaec.sh | 2 +- 9 files changed, 142 insertions(+), 137 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4941b4ef..309e1b43 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-browser # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images 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 d3c8e420..b719c0b8 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,9 +83,8 @@ 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' + gem 'selenium-webdriver', '~> 4.12.0' # Easy installation and use of chromedriver to run system tests with Chrome - gem 'webdrivers' end group :production do diff --git a/Gemfile.lock b/Gemfile.lock index 7235d8ed..b22b98b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,75 +1,76 @@ GEM remote: https://rubygems.org/ specs: - actioncable (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + actioncable (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actionmailbox (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (>= 2.7.1) - actionmailer (6.1.7) - actionpack (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activesupport (= 6.1.7) + actionmailer (6.1.7.6) + actionpack (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activesupport (= 6.1.7.6) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (6.1.7) - actionview (= 6.1.7) - activesupport (= 6.1.7) + actionpack (6.1.7.6) + actionview (= 6.1.7.6) + activesupport (= 6.1.7.6) rack (~> 2.0, >= 2.0.9) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (6.1.7) - actionpack (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + actiontext (6.1.7.6) + actionpack (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) nokogiri (>= 1.8.5) - actionview (6.1.7) - activesupport (= 6.1.7) + actionview (6.1.7.6) + activesupport (= 6.1.7.6) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0) - activejob (6.1.7) - activesupport (= 6.1.7) + activejob (6.1.7.6) + activesupport (= 6.1.7.6) globalid (>= 0.3.6) - activemodel (6.1.7) - activesupport (= 6.1.7) - activerecord (6.1.7) - activemodel (= 6.1.7) - activesupport (= 6.1.7) - activestorage (6.1.7) - actionpack (= 6.1.7) - activejob (= 6.1.7) - activerecord (= 6.1.7) - activesupport (= 6.1.7) + activemodel (6.1.7.6) + activesupport (= 6.1.7.6) + activerecord (6.1.7.6) + activemodel (= 6.1.7.6) + activesupport (= 6.1.7.6) + activestorage (6.1.7.6) + actionpack (= 6.1.7.6) + activejob (= 6.1.7.6) + activerecord (= 6.1.7.6) + activesupport (= 6.1.7.6) marcel (~> 1.0) mini_mime (>= 1.1.0) - activesupport (6.1.7) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) tzinfo (~> 2.0) zeitwerk (~> 2.3) - addressable (2.8.1) + addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) - airbrussh (1.4.1) + airbrussh (1.4.2) sshkit (>= 1.6.1, != 1.7.0) ast (2.4.2) - autoprefixer-rails (10.4.7.0) + autoprefixer-rails (10.4.13.0) execjs (~> 2) + base64 (0.1.1) bcrypt_pbkdf (1.1.0) bindex (0.8.1) - bootsnap (1.15.0) + bootsnap (1.16.0) msgpack (~> 1.2) bootstrap (4.4.1) autoprefixer-rails (>= 9.1.0) @@ -77,14 +78,14 @@ GEM sassc-rails (>= 2.0.0) builder (3.2.4) byebug (11.1.3) - capistrano (3.17.1) + capistrano (3.17.3) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) sshkit (>= 1.9.0) capistrano-bundler (1.6.0) capistrano (~> 3.1) - capistrano-rails (1.6.2) + capistrano-rails (1.6.3) capistrano (~> 3.1) capistrano-bundler (>= 1.1, < 3) capistrano-rbenv (2.2.0) @@ -96,7 +97,7 @@ GEM capistrano-rvm (0.1.2) capistrano (~> 3.0) sshkit (~> 1.2) - capybara (3.38.0) + capybara (3.39.2) addressable matrix mini_mime (>= 0.1.3) @@ -115,8 +116,8 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.1.10) - coveralls_reborn (0.26.0) + concurrent-ruby (1.2.2) + coveralls_reborn (0.28.0) simplecov (~> 0.22.0) term-ansicolor (~> 1.7) thor (~> 1.2) @@ -138,26 +139,27 @@ GEM factory_bot (~> 6.2.0) railties (>= 5.0.0) ffi (1.15.5) - globalid (1.0.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) htmlentities (4.3.4) - i18n (1.12.0) + i18n (1.14.1) concurrent-ruby (~> 1.0) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.5.1) + jquery-rails (4.6.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.6.3) + language_server-protocol (3.17.0.3) listen (3.0.8) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - loofah (2.19.1) + loofah (2.21.3) crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.8.0) + nokogiri (>= 1.12.0) + mail (2.8.1) mini_mime (>= 0.1.1) net-imap net-pop @@ -165,11 +167,11 @@ GEM marcel (1.0.2) matrix (0.4.2) method_source (1.0.0) - mini_mime (1.1.2) - minitest (5.17.0) - msgpack (1.6.0) - mysql2 (0.5.4) - net-imap (0.3.4) + mini_mime (1.1.5) + minitest (5.19.0) + msgpack (1.7.2) + mysql2 (0.5.5) + net-imap (0.3.7) date net-protocol net-pop (0.1.2) @@ -180,50 +182,55 @@ GEM net-ssh (>= 2.6.5, < 8.0.0) net-smtp (0.3.3) net-protocol - net-ssh (7.0.1) - nio4r (2.5.8) - nokogiri (1.13.10-x86_64-darwin) + net-ssh (7.2.0) + nio4r (2.5.9) + nokogiri (1.15.4-arm64-darwin) + racc (~> 1.4) + nokogiri (1.15.4-x86_64-darwin) racc (~> 1.4) pagy (3.11.0) - parallel (1.22.1) - parser (3.2.0.0) + parallel (1.23.0) + parser (3.2.2.3) ast (~> 2.4.1) + racc popper_js (1.16.1) - public_suffix (5.0.1) + public_suffix (5.0.3) puma (3.12.6) - racc (1.6.2) - rack (2.2.5) - rack-proxy (0.7.4) + racc (1.7.1) + rack (2.2.8) + rack-proxy (0.7.7) rack - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) - rails (6.1.7) - actioncable (= 6.1.7) - actionmailbox (= 6.1.7) - actionmailer (= 6.1.7) - actionpack (= 6.1.7) - actiontext (= 6.1.7) - actionview (= 6.1.7) - activejob (= 6.1.7) - activemodel (= 6.1.7) - activerecord (= 6.1.7) - activestorage (= 6.1.7) - activesupport (= 6.1.7) + rails (6.1.7.6) + actioncable (= 6.1.7.6) + actionmailbox (= 6.1.7.6) + actionmailer (= 6.1.7.6) + actionpack (= 6.1.7.6) + actiontext (= 6.1.7.6) + actionview (= 6.1.7.6) + activejob (= 6.1.7.6) + activemodel (= 6.1.7.6) + activerecord (= 6.1.7.6) + activestorage (= 6.1.7.6) + activesupport (= 6.1.7.6) bundler (>= 1.15.0) - railties (= 6.1.7) + railties (= 6.1.7.6) sprockets-rails (>= 2.0.0) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest nokogiri (>= 1.6) - rails-html-sanitizer (1.4.4) - loofah (~> 2.19, >= 2.19.1) - railties (6.1.7) - actionpack (= 6.1.7) - activesupport (= 6.1.7) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (6.1.7.6) + actionpack (= 6.1.7.6) + activesupport (= 6.1.7.6) method_source rake (>= 12.2) thor (~> 1.0) @@ -233,40 +240,42 @@ GEM rb-inotify (0.10.1) ffi (~> 1.0) rb-readline (0.5.5) - regexp_parser (2.6.1) - rexml (3.2.5) - rspec-core (3.12.0) + regexp_parser (2.8.1) + rexml (3.2.6) + rspec-core (3.12.2) rspec-support (~> 3.12.0) - rspec-expectations (3.12.2) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-mocks (3.12.2) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.12.0) - rspec-rails (6.0.1) + rspec-rails (6.0.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) - rspec-support (3.12.0) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (1.43.0) + rubocop (1.56.2) + base64 (~> 0.1.1) json (~> 2.3) + language_server-protocol (>= 3.17.0) parallel (~> 1.10) - parser (>= 3.2.0.0) + parser (>= 3.2.2.3) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.8, < 3.0) rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.24.1, < 2.0) + rubocop-ast (>= 1.28.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.24.1) - parser (>= 3.1.1.0) - ruby-progressbar (1.11.0) + rubocop-ast (1.29.0) + parser (>= 3.2.1.0) + ruby-progressbar (1.13.0) rubyzip (2.3.2) sass (3.7.4) sass-listen (~> 4.0.0) @@ -287,7 +296,7 @@ GEM sprockets (> 3.0) sprockets-rails tilt - selenium-webdriver (4.7.1) + selenium-webdriver (4.12.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) @@ -309,16 +318,17 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.5.4-x86_64-darwin) - sshkit (1.21.3) + sqlite3 (1.6.4-arm64-darwin) + sqlite3 (1.6.4-x86_64-darwin) + sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - thor (1.2.1) - tilt (2.0.11) - timeout (0.3.1) + thor (1.2.2) + tilt (2.2.0) + timeout (0.4.0) tins (1.32.1) sync truncato (0.7.12) @@ -327,34 +337,31 @@ GEM turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - tzinfo (2.0.5) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) 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) railties (>= 6.0.0) - webdrivers (5.2.0) - nokogiri (~> 1.6) - rubyzip (>= 1.3.0) - selenium-webdriver (~> 4.0) - webpacker (5.4.3) + webpacker (5.4.4) activesupport (>= 5.2) rack-proxy (>= 0.6.1) railties (>= 5.2) semantic_range (>= 2.3.0) websocket (1.2.9) - websocket-driver (0.7.5) + websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.6) + zeitwerk (2.6.11) PLATFORMS + arm64-darwin-22 x86_64-darwin-21 DEPENDENCIES @@ -382,14 +389,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 + selenium-webdriver (~> 4.12.0) simplecov spring spring-watcher-listen (~> 2.0.0) @@ -399,11 +406,10 @@ DEPENDENCIES tzinfo-data uglifier (>= 1.3.0) web-console (>= 3.3.0) - webdrivers webpacker RUBY VERSION - ruby 3.0.5p211 + ruby 3.2.2p53 BUNDLED WITH - 2.4.1 + 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..f2db36a5 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.7.6 # 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 From c2fb8a505033477c234b445b8521412e14b43c90 Mon Sep 17 00:00:00 2001 From: Janell-Huyck Date: Tue, 5 Sep 2023 17:12:13 -0400 Subject: [PATCH 02/11] fix bug in tests related to parsing string literal in config/application.rb --- config/application.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/application.rb b/config/application.rb index f2db36a5..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.1.7.6 + config.load_defaults 6.1 # Settings in config/environments/* take precedence over those specified here. # Application configuration can go into files in config/initializers From 629205ddfaeb43af726654d0bf126508090eab1d Mon Sep 17 00:00:00 2001 From: Janell-Huyck Date: Wed, 6 Sep 2023 08:42:44 -0400 Subject: [PATCH 03/11] adjust circleci docker build from 3.2.2-browser to 3.2.2 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 309e1b43..969273da 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.2.2-browser + - image: cimg/ruby:3.2.2 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images From 0b9e6d9486d348ccb3f66e24408a621e24ca440e Mon Sep 17 00:00:00 2001 From: Janell-Huyck Date: Wed, 6 Sep 2023 09:00:02 -0400 Subject: [PATCH 04/11] added workaround for circleci orb issue #75 --- .circleci/config.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 969273da..e10ad575 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,7 +44,9 @@ jobs: steps: - checkout - - browser-tools/install-chrome + # - 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: From 37f519a8506d3b1c1cebc29eaecc14040c0e3698 Mon Sep 17 00:00:00 2001 From: Janell-Huyck Date: Wed, 6 Sep 2023 09:07:20 -0400 Subject: [PATCH 05/11] check node version in circleci tests --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index e10ad575..621da73a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,6 +44,9 @@ jobs: steps: - checkout + - run: + name: Check Node.js version + command: node -v # - 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 From c093dac2a2b83bd41363b2aa8a5a34005cb04696 Mon Sep 17 00:00:00 2001 From: Janell-Huyck Date: Wed, 6 Sep 2023 09:11:01 -0400 Subject: [PATCH 06/11] fixed indentation in circleci config file --- .circleci/config.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 621da73a..3988a92b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,15 +42,16 @@ jobs: working_directory: ~/aaec - steps: - - checkout - - run: + steps: + - checkout + - run: name: Check Node.js version command: node -v - # - 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 + # - 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: keys: From d52018ebf3b977fd0ad0c80248b1fb24615e0c6f Mon Sep 17 00:00:00 2001 From: Janell-Huyck Date: Wed, 6 Sep 2023 09:12:59 -0400 Subject: [PATCH 07/11] fixed indentation in circleci config file (again) --- .circleci/config.yml | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3988a92b..39bc7a3a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -42,16 +42,15 @@ jobs: working_directory: ~/aaec - steps: - - checkout - - run: - name: Check Node.js version - command: node -v - # - 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 - + steps: + - checkout + - run: + name: Check Node.js version + command: node --version + # - 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: keys: From 703977d433a67ce210d8a63ff9a6292fb0fd1812 Mon Sep 17 00:00:00 2001 From: Janell-Huyck Date: Wed, 6 Sep 2023 09:19:45 -0400 Subject: [PATCH 08/11] added instructions to install node to circleci yml file --- .circleci/config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 39bc7a3a..04dca655 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -44,6 +44,9 @@ jobs: steps: - checkout + - node/install: + install-npm: true + node-version: "18.17.1" - run: name: Check Node.js version command: node --version From 0d6dc4328db3ac9a572a0df139a82eeda226121a Mon Sep 17 00:00:00 2001 From: Janell-Huyck Date: Wed, 6 Sep 2023 09:22:18 -0400 Subject: [PATCH 09/11] removed 'install npm: true' from circleci config file --- .circleci/config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 04dca655..8ffb5e22 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,7 +45,6 @@ jobs: steps: - checkout - node/install: - install-npm: true node-version: "18.17.1" - run: name: Check Node.js version From f9708d36e93bf8c3311d0af918e1406d2d916e65 Mon Sep 17 00:00:00 2001 From: Janell-Huyck Date: Wed, 6 Sep 2023 09:28:07 -0400 Subject: [PATCH 10/11] removed unnecessary logging of node version in circleci config file --- .circleci/config.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ffb5e22..484f053a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -46,10 +46,7 @@ jobs: - checkout - node/install: node-version: "18.17.1" - - run: - name: Check Node.js version - command: node --version - # - browser-tools/install-chrome # TODO: change the following 2 lines to this after fixing the orb issue #75. + # - 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 From e66fc2d19ff7c3468c829881f6e117ed83369171 Mon Sep 17 00:00:00 2001 From: Thomas Scherz Date: Thu, 7 Sep 2023 11:26:53 -0400 Subject: [PATCH 11/11] Adds platform to Gemfile.lock --- Gemfile.lock | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index 5d41ea25..13ed3b29 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) @@ -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) @@ -359,6 +365,8 @@ GEM PLATFORMS arm64-darwin-22 + x86_64-darwin-22 + x86_64-linux DEPENDENCIES bcrypt_pbkdf