Skip to content

Commit 9e42537

Browse files
authored
Merge pull request #79 from datacite/ks-rails-upgrade/7.2
Upgrade: Rails 7.1 → 7.2 & Ruby 3.1.7 → 3.2.9
2 parents 65ad147 + f49f950 commit 9e42537

74 files changed

Lines changed: 345 additions & 265 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/parallel_ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
fail-fast: true
99
services:
1010
memcached:
11-
image: memcached:1.4.31
11+
image: memcached:1.6.32
1212
ports:
1313
- 11211/udp
1414
env:
@@ -22,10 +22,10 @@ jobs:
2222
- name: Checkout Code
2323
uses: actions/checkout@v3
2424

25-
- name: Set up Ruby 3.1.6
25+
- name: Set up Ruby
2626
uses: ruby/setup-ruby@v1
2727
with:
28-
ruby-version: "3.1.6"
28+
ruby-version: "3.2.9"
2929
bundler-cache: true
3030

3131
- name: Run Specs

.github/workflows/rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v4
12-
- name: Set up Ruby 3.0
12+
- name: Set up Ruby
1313
uses: ruby/setup-ruby@v1
1414
with:
15-
ruby-version: 3.1.6
15+
ruby-version: 3.2.9
1616
- name: Cache gems
1717
uses: actions/cache@v4
1818
with:

.rubocop.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require:
1111
- rubocop-factory_bot
1212

1313
AllCops:
14-
TargetRubyVersion: 3.0
14+
TargetRubyVersion: 3.2
1515
Exclude:
1616
- "bin/**/*"
1717
- "log/**/*"
@@ -33,3 +33,10 @@ Layout/SpaceInsideHashLiteralBraces:
3333

3434
RSpec/ExampleLength:
3535
Enabled: false
36+
37+
Style/FrozenStringLiteralComment:
38+
Enabled: false
39+
40+
Rails/SkipsModelValidations:
41+
Exclude:
42+
- "db/migrate/**/*"

.ruby-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3.2.9

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
FROM phusion/passenger-ruby31:3.0.7
1+
FROM phusion/passenger-ruby32:3.1.4
22

33
# Set correct environment variables.
4-
ENV HOME /home/app
5-
ENV LC_ALL en_US.UTF-8
6-
ENV LANG en_US.UTF-8
4+
ENV HOME=/home/app
5+
ENV LC_ALL=en_US.UTF-8
6+
ENV LANG=en_US.UTF-8
77

88
# Allow app user to read /etc/container_environment
99
RUN usermod -a -G docker_env app
1010

1111
# Use baseimage-docker's init process.
1212
CMD ["/sbin/my_init"]
1313

14-
# Use Ruby 3.1.6
15-
RUN bash -lc 'rvm --default use ruby-3.1.6'
14+
# Use Ruby
15+
RUN bash -lc 'rvm --default use ruby-3.2.9'
1616

1717
# Update installed APT packages
1818
RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
@@ -47,7 +47,7 @@ RUN mkdir -p vendor/bundle && \
4747
chown -R app:app . && \
4848
chmod -R 755 . && \
4949
gem install rubygems-update -v 3.5.6 && \
50-
gem install bundler:2.5.6 && \
50+
gem install bundler:2.6.9 && \
5151
/sbin/setuser app bundle config set --local path 'vendor/bundle' && \
5252
/sbin/setuser app bundle install
5353

Gemfile

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
# frozen_string_literal: true
2-
31
source "https://rubygems.org"
42

5-
ruby "3.1.6"
3+
ruby "3.2.9"
64

7-
gem "rails", "~> 7.1.3", ">= 7.1.3.2"
5+
gem "rails", "~> 7.2", ">= 7.2.3"
86
gem "bootsnap", require: false
97
gem "rack-cors"
10-
gem "shoryuken", "~> 4.0"
8+
gem "shoryuken", "~> 7.0"
119
gem "aws-sdk-sqs", "~> 1.3"
1210
gem "lograge", "~> 0.11.2"
1311
gem "logstash-event", "~> 1.2", ">= 1.2.02"

0 commit comments

Comments
 (0)