Skip to content

Commit 1e061af

Browse files
committed
chore: upgrade to rails 7.1 and ruby 3.4
1 parent 9c5f96a commit 1e061af

13 files changed

Lines changed: 174 additions & 132 deletions

File tree

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ jobs:
5252
registry: ghcr.io
5353
username: ${{ github.actor }}
5454
password: ${{ secrets.GITHUB_TOKEN }}
55-
- run: docker-compose pull
55+
- run: docker compose pull
5656
env:
5757
POSTAL_IMAGE: ghcr.io/postalserver/postal:ci-${{ github.sha }}
58-
- run: docker-compose run postal sh -c 'bundle exec rspec'
58+
- run: docker compose run postal sh -c 'bundle exec rspec'
5959
env:
6060
POSTAL_IMAGE: ghcr.io/postalserver/postal:ci-${{ github.sha }}
6161

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.2.2
1+
3.4.6

Dockerfile

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,13 @@
1-
FROM ruby:3.2.2-bullseye AS base
1+
FROM ruby:3.4.6-bookworm AS base
22

33
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
4-
RUN apt-get update \
5-
&& apt-get install -y --no-install-recommends \
6-
software-properties-common dirmngr apt-transport-https \
7-
&& (curl -sL https://deb.nodesource.com/setup_20.x | bash -) \
8-
&& rm -rf /var/lib/apt/lists/*
4+
RUN (curl -sL https://deb.nodesource.com/setup_20.x | bash -)
95

106
# Install main dependencies
117
RUN apt-get update && \
128
apt-get install -y --no-install-recommends \
139
build-essential \
14-
netcat \
10+
netcat-openbsd \
1511
curl \
1612
libmariadb-dev \
1713
libcap2-bin \
@@ -31,7 +27,7 @@ RUN mkdir -p /opt/postal/app /opt/postal/config
3127
WORKDIR /opt/postal/app
3228

3329
# Install bundler
34-
RUN gem install bundler -v 2.5.6 --no-doc
30+
RUN gem install bundler -v 2.7.2 --no-doc
3531

3632
# Install the latest and active gem dependencies and re-run
3733
# the appropriate commands to handle installs.

Gemfile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# frozen_string_literal: true
22

33
source "https://rubygems.org"
4+
gem "abbrev"
45
gem "authie"
56
gem "autoprefixer-rails"
67
gem "bcrypt"
@@ -17,14 +18,17 @@ gem "jwt"
1718
gem "kaminari"
1819
gem "klogger-logger"
1920
gem "konfig-config", "~> 3.0"
21+
gem "logger"
2022
gem "mail"
23+
gem "mutex_m"
2124
gem "mysql2"
2225
gem "nifty-utils"
2326
gem "nilify_blanks"
2427
gem "nio4r"
28+
gem "ostruct"
2529
gem "prometheus-client"
2630
gem "puma"
27-
gem "rails", "= 7.0.8.1"
31+
gem "rails", "= 7.1.5.2"
2832
gem "resolv"
2933
gem "secure_headers"
3034
gem "sentry-rails"
@@ -47,12 +51,15 @@ end
4751

4852
group :development do
4953
gem "annotate"
50-
gem "database_cleaner", require: false
51-
gem "factory_bot_rails", require: false
52-
gem "rspec", require: false
53-
gem "rspec-rails", require: false
5454
gem "rubocop"
5555
gem "rubocop-rails"
56+
end
57+
58+
group :test do
59+
gem "database_cleaner-active_record"
60+
gem "factory_bot_rails"
61+
gem "rspec"
62+
gem "rspec-rails"
5663
gem "shoulda-matchers"
5764
gem "timecop"
5865
gem "webmock"

0 commit comments

Comments
 (0)