Upgrade: Rails 7.2 → 8.1 & Ruby 3.2.9 → 4.0.1

.github/workflows/build.yml

@@ -50,5 +50,7 @@ jobs:
           tags: |
             ${{ inputs.image_name }}:${{ inputs.image_tag }}
             ghcr.io/${{ inputs.image_name }}:${{ inputs.image_tag }}
+          build-args: |
+            GIT_TAG=${{ inputs.image_tag }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache

.github/workflows/deploy.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2.10'
+          ruby-version: '4.0.1'
       - uses: actions/cache@v4
         with:
           path: vendor/bundle
@@ -82,6 +82,8 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: ${{ github.repository }}:latest
+          build-args: |
+            GIT_TAG=latest
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
       - name: Push to GitHub Packages

.github/workflows/parallel_ci.yml

@@ -2,6 +2,24 @@ name: Parallel CI
 on:
     workflow_call:
 jobs:
+    security:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout Code
+              uses: actions/checkout@v3
+
+            - name: Set up Ruby
+              uses: ruby/setup-ruby@v1
+              with:
+                ruby-version: "4.0.1"
+                bundler-cache: true
+
+            - name: Run Brakeman
+              run: bundle exec brakeman --no-pager
+
+            - name: Run Bundler Audit
+              run: |
+                bundle exec bundler-audit check --update
     parallel-test:
         runs-on: ubuntu-latest
         strategy:
@@ -29,7 +47,7 @@ jobs:
             - name: Set up Ruby
               uses: ruby/setup-ruby@v1
               with:
-                ruby-version: "3.2.10"
+                ruby-version: "4.0.1"
                 bundler-cache: true
 
             - name: Run Specs

.github/workflows/release.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.2.10'
+          ruby-version: '4.0.1'
       - uses: actions/cache@v4
         with:
           path: vendor/bundle
@@ -83,6 +83,8 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: ${{ github.repository }}:${{ steps.set_git_vars.outputs.GIT_TAG }}
+          build-args: |
+            GIT_TAG=${{ steps.set_git_vars.outputs.GIT_TAG }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
       - name: Push to GitHub Packages
@@ -92,6 +94,8 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: ghcr.io/${{ github.repository }}:${{ steps.set_git_vars.outputs.GIT_TAG }}
+          build-args: |
+            GIT_TAG=${{ steps.set_git_vars.outputs.GIT_TAG }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
 

.ruby-version

@@ -1 +1 @@
-3.2.10
+ruby-4.0.1

Dockerfile

@@ -1,4 +1,4 @@
-FROM phusion/passenger-full:3.1.6
+FROM phusion/passenger-ruby40:3.1.6
 LABEL maintainer="support@datacite.org"
 
 # Set correct environment variables.
@@ -12,7 +12,7 @@ RUN usermod -a -G docker_env app
 CMD ["/sbin/my_init"]
 
 # Use Ruby
-RUN bash -lc 'rvm --default use ruby-3.2.10'
+RUN bash -lc 'rvm --default use ruby-4.0.1'
 
 # Update installed APT packages
 RUN apt-get update && apt-get upgrade -y --allow-unauthenticated -o Dpkg::Options::="--force-confold" && \
@@ -67,5 +67,8 @@ COPY vendor/docker/10_ssh.sh /etc/my_init.d/10_ssh.sh
 
 # COPY vendor/docker/80_flush_cache.sh /etc/my_init.d/80_flush_cache.sh
 
+ARG GIT_TAG=1.0
+ENV GIT_TAG=${GIT_TAG}
+
 # Expose web
 EXPOSE 80

Gemfile

@@ -2,70 +2,60 @@
 
 source "https://rubygems.org"
 
-gem "active_model_serializers", "~> 0.10.0"
-gem "addressable", "2.8.0"
-gem "api-pagination"
-gem "aws-sdk-sqs", "~> 1.3"
-gem "bcrypt", "~> 3.1.7"
-gem "bolognese", "~> 2.5.1"
-gem "bootsnap", "~> 1.2", ">= 1.2.1"
-gem "cancancan", "~> 2.0"
-gem "connection_pool", "< 3.0"
-gem "countries", "~> 2.1", ">= 2.1.2"
-gem "country_select", "~> 3.1"
-gem "dalli", "~> 3.2", ">= 3.2.8"
-gem "dotenv"
-gem "equivalent-xml", "~> 0.6.0"
+gem "active_model_serializers", "~> 0.10.16"
+gem "addressable", "2.9"
+gem "api-pagination", "~> 7.1"
+gem "aws-sdk-sqs", "~> 1.112"
+gem "bolognese", "~> 2.6"
+gem "bootsnap", "~> 1.23"
+gem "cancancan", "~> 3.6", ">= 3.6.1"
+gem "dalli", "~> 5.0", ">= 5.0.2"
+gem "dotenv", "~> 3.2"
 gem "facets", require: false
-gem "faraday_middleware-aws-sigv4", "~> 0.3.0"
-gem "git", "~> 1.5"
-gem "iso8601", "~> 0.9.0"
-gem "jwt"
-gem "kaminari", "~> 1.0", ">= 1.0.1"
-gem "lograge", "~> 0.11.2"
-gem "logstash-event", "~> 1.2", ">= 1.2.02"
-gem "logstash-logger", "~> 0.26.1"
-gem "maremma", "~> 5.0"
-gem "nokogiri", "~> 1.16", ">= 1.16.3"
-gem "oai", "~> 1.2", ">= 1.2.1"
-gem "oj", ">= 2.8.3"
+gem "iso8601", "~> 0.13.0"
+gem "jwt", "~> 3.1", ">= 3.1.2"
+gem "kaminari", "~> 1.2", ">= 1.2.2"
+gem "lograge", "~> 0.14.0"
+gem "logstash-logger", "~> 1.0"
+gem "maremma", "~> 6.0"
+gem "nokogiri", "~> 1.19", ">= 1.19.2"
+gem "oai", "~> 1.3"
+gem "oj", "~> 3.16", ">= 3.16.17"
 gem "oj_mimic_json", "~> 1.0", ">= 1.0.1"
-gem "rack-cors", "~> 1.0", require: "rack/cors"
-gem "rack-utf8_sanitizer", "~> 1.6"
-gem "rails", "~> 7.2"
-gem "sentry-raven", "~> 3.1", ">= 3.1.2"
-gem "shoryuken", "~> 7.0"
-gem "simple_command"
-gem "slack-notifier", "~> 2.3", ">= 2.3.2"
-gem "sprockets", "~> 3.7", ">= 3.7.2"
-gem "stringio", "3.0.1"
-gem 'next_rails'
-gem "json-canonicalization", '0.3.1'
-gem 'msgpack', "~> 1.4.4"
+gem "rack-cors", "~> 3.0", require: "rack/cors"
+gem "rack-utf8_sanitizer", "~> 1.11", ">= 1.11.1"
+gem "rails", "~> 8.1", ">= 8.1.3"
+gem "sentry-ruby", "~> 6.4", ">= 6.4.1"
+gem "sentry-rails", "~> 6.4", ">= 6.4.1"
+gem "shoryuken", "~> 7.0", ">= 7.0.1"
+gem "slack-notifier", "~> 2.4"
+gem "sprockets", "~> 4.2", ">= 4.2.2"
+gem "stringio", "3.2"
+gem "next_rails", "~> 1.5"
+gem 'msgpack', "~> 1.8"
 
 group :development, :test do
-  gem "better_errors"
-  gem "byebug", platforms: %i[mri mingw x64_mingw]
-  gem "rspec-rails", "~> 8.0", ">= 8.0.2"
-  gem "rubocop", "~> 1.82", ">= 1.82.1"
+  gem "byebug", "~> 13.0", platforms: %i[mri mingw x64_mingw]
+  gem "rspec-rails", "~> 8.0", ">= 8.0.4"
+  gem "rubocop", "~> 1.86", ">= 1.86.1"
   gem "rubocop-performance", "~> 1.26", ">= 1.26.1"
   gem "rubocop-rails", "~> 2.34", ">= 2.34.3"
 end
 
 group :development do
-  gem "listen", "~> 3.9"
-  gem "spring", "~> 4.2"
+  gem "brakeman", "~> 8.0", ">= 8.0.4"
+  gem "bundler-audit", "~> 0.9.3"
+  gem "listen", "~> 3.10"
+  gem "spring", "~> 4.4", ">= 4.4.2"
   gem "spring-watcher-listen", "~> 2.1"
 end
 
 group :test do
-  gem "capybara"
-  gem "codeclimate-test-reporter", "~> 1.0.0"
-  gem "factory_bot_rails", "~> 4.8", ">= 4.8.2"
-  gem "faker", "~> 2.22"
-  gem "rubocop-rspec", "~> 1.28"
-  gem "shoulda-matchers", "~> 4.1", ">= 4.1.2"
-  gem "simplecov"
-  gem "vcr", "~> 6.2"
-  gem "webmock", "~> 3.1"
+  gem "factory_bot_rails", "~> 6.5", ">= 6.5.1"
+  gem "faker", "~> 3.6", ">= 3.6.1"
+  gem "rubocop-rspec", "~> 3.9"
+  gem "shoulda-matchers", "~> 7.0", ">= 7.0.1"
+  gem "simplecov", "~> 0.22"
+  gem "vcr", "~> 6.4"
+  gem "webmock", "~> 3.26.2"
 end