Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/parallel_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
fail-fast: true
services:
memcached:
image: memcached:1.4.31
image: memcached:1.6.32
ports:
- 11211/udp
env:
Expand All @@ -22,10 +22,10 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v3

- name: Set up Ruby 3.1.6
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: "3.1.6"
ruby-version: "3.2.9"
bundler-cache: true

- name: Run Specs
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up Ruby 3.0
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.6
ruby-version: 3.2.9
- name: Cache gems
uses: actions/cache@v4
with:
Expand Down
9 changes: 8 additions & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ require:
- rubocop-factory_bot

AllCops:
TargetRubyVersion: 3.0
TargetRubyVersion: 3.2
Exclude:
- "bin/**/*"
- "log/**/*"
Expand All @@ -33,3 +33,10 @@ Layout/SpaceInsideHashLiteralBraces:

RSpec/ExampleLength:
Enabled: false

Style/FrozenStringLiteralComment:
Enabled: false

Rails/SkipsModelValidations:
Exclude:
- "db/migrate/**/*"
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.2.9
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
FROM phusion/passenger-ruby31:3.0.7
FROM phusion/passenger-ruby32:3.1.4

# Set correct environment variables.
ENV HOME /home/app
ENV LC_ALL en_US.UTF-8
ENV LANG en_US.UTF-8
ENV HOME=/home/app
ENV LC_ALL=en_US.UTF-8
ENV LANG=en_US.UTF-8

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

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

# Use Ruby 3.1.6
RUN bash -lc 'rvm --default use ruby-3.1.6'
# Use Ruby
RUN bash -lc 'rvm --default use ruby-3.2.9'

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

Expand Down
8 changes: 3 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
# frozen_string_literal: true

source "https://rubygems.org"

ruby "3.1.6"
ruby "3.2.9"

gem "rails", "~> 7.1.3", ">= 7.1.3.2"
gem "rails", "~> 7.2", ">= 7.2.3"
gem "bootsnap", require: false
gem "rack-cors"
gem "shoryuken", "~> 4.0"
gem "shoryuken", "~> 7.0"
gem "aws-sdk-sqs", "~> 1.3"
gem "lograge", "~> 0.11.2"
gem "logstash-event", "~> 1.2", ">= 1.2.02"
Expand Down
Loading