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 & NodeJS #6563

Draft
wants to merge 14 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion .circleci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cimg/ruby:3.1.6-browsers
FROM cimg/ruby:3.2.6-browsers

RUN sudo sh -c 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list' \
&& wget -qO- https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo tee /etc/apt/trusted.gpg.d/pgdg.asc &>/dev/null
Expand Down
23 changes: 13 additions & 10 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
build:
working_directory: ~/figgy
docker:
- image: ghcr.io/pulibrary/figgy:ci
- image: ghcr.io/pulibrary/figgy:sha-431d7e1
environment:
RAILS_ENV: test
FIGGY_DB_HOST: localhost
Expand All @@ -25,22 +25,25 @@ jobs:
- checkout
- node/install:
install-yarn: true
node-version: '18.20.2'
node-version: '22.11.0'
- run:
name: Check current version of node
command: node -v
# Restore Cached Dependencies
- restore_cache:
keys:
- figgy-{{ checksum "Gemfile.lock" }}-{{ checksum "yarn.lock" }}-20230518
- figgy-{{ checksum "Gemfile.lock" }}-{{ checksum "yarn.lock" }}-20241209
# Install Bundler
- run: gem install bundler -v '2.3.18'
# Bundle install dependencies
- run: bundle install --path vendor/bundle
- save_cache:
key: figgy-{{ checksum "Gemfile.lock" }}-{{ checksum "yarn.lock" }}-20230518
key: figgy-{{ checksum "Gemfile.lock" }}-{{ checksum "yarn.lock" }}-20241209
paths:
- ./vendor/bundle
- run:
name: Configure Mapnik repository
command: "npm config set //npm.pkg.github.com/:_authToken ${GITHUB_PACKAGE_TOKEN} && npm config set @mapnik:registry https://npm.pkg.github.com"
- run:
name: Install NPM Dependencies via Yarn
command: yarn install --frozen-lockfile
Expand All @@ -51,7 +54,7 @@ jobs:
yarn install --frozen-lockfile
- save_cache:
name: Save Yarn Package Cache
key: figgy-yarn-{{ checksum "yarn.lock" }}-20230518
key: figgy-yarn-{{ checksum "yarn.lock" }}-20241209
paths:
- ~/.cache/yarn
- persist_to_workspace:
Expand All @@ -60,7 +63,7 @@ jobs:
test:
working_directory: ~/figgy
docker:
- image: ghcr.io/pulibrary/figgy:ci
- image: ghcr.io/pulibrary/figgy:sha-431d7e1
environment:
RAILS_ENV: test
FIGGY_DB_HOST: localhost
Expand All @@ -87,7 +90,7 @@ jobs:
at: '~/figgy'
- node/install:
install-yarn: true
node-version: '18.20.2'
node-version: '22.11.0'
- run:
name: Check current version of node
command: node -v
Expand Down Expand Up @@ -137,7 +140,7 @@ jobs:
coverage_report:
working_directory: ~/figgy
docker:
- image: ghcr.io/pulibrary/figgy:ci
- image: ghcr.io/pulibrary/figgy:sha-431d7e1
resource_class: large
steps:
- attach_workspace:
Expand All @@ -154,7 +157,7 @@ jobs:
rubocop:
working_directory: ~/figgy
docker:
- image: ghcr.io/pulibrary/figgy:ci
- image: ghcr.io/pulibrary/figgy:sha-431d7e1
environment:
RAILS_ENV: test
FIGGY_DB_HOST: localhost
Expand All @@ -168,7 +171,7 @@ jobs:
at: '~/figgy'
- node/install:
install-yarn: true
node-version: '18.20.2'
node-version: '22.11.0'
- run:
name: Check current version of node
command: node -v
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ruby 3.1.0
nodejs 18.18.0
ruby 3.2.6
nodejs 22.11.0
java zulu-8.58.0.13
python 3.9.1
yarn 1.22.10
13 changes: 8 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ gem "capistrano-rails-console"
gem "cocoon"
gem "coffee-rails"
gem "dalli"
gem "ddtrace"
gem "datadog", "~> 2.7.1"
gem "devise", ">= 4.6.0"
gem "devise-guests", git: "https://github.com/cbeer/devise-guests.git"
gem "dnsruby"
Expand All @@ -47,6 +47,7 @@ gem "hydra-derivatives", github: "samvera/hydra-derivatives", branch: "main"
gem "hydra-head", github: "samvera/hydra-head", branch: "main"
gem "hydra-role-management"
gem "iiif_manifest", "1.1.1"
gem "image_processing", "~> 1.2"
gem "iso-639"
gem "jbuilder"
gem "jquery-datatables"
Expand All @@ -70,13 +71,13 @@ gem "modernizr-rails"
gem "net-ssh", "~> 7.1.0"
gem "normalize-rails"
gem "oai"
gem "omniauth", "1.9.2"
gem "omniauth-cas", "2.0.0"
gem "omniauth", "2.1.2"
gem "omniauth-cas", "3.0.0"
gem "openseadragon"
gem "pg"
gem "prawn"
gem "puma"
gem "rack"
gem "rack", "~> 3.1.0"
gem "rack-cors", require: "rack/cors"
gem "rails", "~> 7.1.0"
gem "recipient_interceptor"
Expand All @@ -89,6 +90,7 @@ gem "ruby-progressbar"
gem "ruby_tika_app", git: "https://github.com/pulibrary/ruby_tika_app", branch: "main"
gem "ruby-vips"
gem "rubyzip"
gem "sassc-rails"
gem "shrine-google_cloud_storage"
gem "simple_form"
gem "sprockets"
Expand All @@ -100,7 +102,8 @@ gem "valkyrie-derivatives", git: "https://github.com/samvera-labs/valkyrie-deriv
gem "valkyrie-sequel", "~> 3.0.0-beta.1"
gem "valkyrie-shrine"
gem "view_component", require: "view_component/engine"
gem "vite_rails"
gem "vite_rails", "3.0.17"
gem "vite_ruby", "3.8.0"
gem "whenever", "~> 0.10"

# Required for deployment under ruby 3.1
Expand Down
Loading
Loading