Skip to content

Commit 4dd7598

Browse files
authored
Merge pull request #863 from Fryguy/upgrade_ruby
Upgrade Ruby to 3.3
2 parents a151063 + c7c4eb5 commit 4dd7598

6 files changed

Lines changed: 17 additions & 13 deletions

File tree

.github/workflows/build_and_deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
- name: Set up Ruby
1313
uses: ruby/setup-ruby@v1
1414
with:
15-
ruby-version: "3.1"
15+
ruby-version: "3.3"
1616
bundler-cache: true
1717
- name: Docker login
1818
run: echo ${{ secrets.DOCKER_REGISTRY_PASSWORD }} | docker login docker.io --password-stdin --username ${{ secrets.DOCKER_REGISTRY_USERNAME }}

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
strategy:
2020
matrix:
2121
ruby-version:
22-
- '3.1'
22+
- '3.3'
2323
services:
2424
postgres:
2525
image: manageiq/postgresql:13

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN ARCH=$(uname -m) && \
2727
https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm && \
2828
dnf -y --disablerepo=ubi-9-baseos-rpms swap openssl-fips-provider openssl-libs && \
2929
dnf -y --disableplugin=subscription-manager module enable nodejs:18 && \
30-
dnf -y module enable ruby:3.1 && \
30+
dnf -y module enable ruby:3.3 && \
3131
dnf -y update && \
3232
dnf clean all && \
3333
rm -rf /var/cache/dnf

Gemfile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22

33
# The Ruby version should match the lowest acceptable version of the application
4-
ruby "~> 3.1.4"
4+
ruby "~> 3.3.10"
55

66
plugin 'bundler-inject'
77
require File.join(Bundler::Plugin.index.load_paths("bundler-inject")[0], "bundler-inject") rescue nil
@@ -59,3 +59,7 @@ group :test do
5959
gem 'factory_bot_rails'
6060
gem 'webmock'
6161
end
62+
63+
# Gems listed to avoid warnings about their removal in future rubies
64+
gem 'drb' # Used by activesupport-7.0.8.7/lib/active_support/testing/parallelization.rb
65+
gem 'mutex_m' # Used by activesupport-7.0.8.7/lib/active_support/notifications.rb

Gemfile.lock

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ GEM
8989
activerecord (>= 6.1, < 8.2)
9090
diff-lcs (1.6.2)
9191
docile (1.4.1)
92+
drb (2.2.3)
9293
erb (4.0.4)
9394
cgi (>= 0.3.3)
9495
erubi (1.13.1)
@@ -107,7 +108,6 @@ GEM
107108
faraday (>= 0.8)
108109
faraday-net_http (3.4.2)
109110
net-http (~> 0.5)
110-
ffi (1.17.3)
111111
ffi (1.17.3-arm64-darwin)
112112
ffi (1.17.3-x86_64-linux-gnu)
113113
foreman (0.90.0)
@@ -166,12 +166,12 @@ GEM
166166
marcel (1.0.4)
167167
method_source (1.1.0)
168168
mini_mime (1.1.5)
169-
mini_portile2 (2.8.9)
170169
minigit (0.0.4)
171170
minitest (5.27.0)
172171
more_core_extensions (4.5.1)
173172
activesupport
174173
sync
174+
mutex_m (0.3.0)
175175
net-http (0.9.1)
176176
uri (>= 0.11.1)
177177
net-imap (0.5.7)
@@ -185,9 +185,6 @@ GEM
185185
net-protocol
186186
net-ssh (7.3.0)
187187
nio4r (2.7.5)
188-
nokogiri (1.18.10)
189-
mini_portile2 (~> 2.8.2)
190-
racc (~> 1.4)
191188
nokogiri (1.18.10-arm64-darwin)
192189
racc (~> 1.4)
193190
nokogiri (1.18.10-x86_64-linux-gnu)
@@ -201,7 +198,6 @@ GEM
201198
parser (3.3.10.1)
202199
ast (~> 2.4.1)
203200
racc
204-
pg (1.6.3)
205201
pg (1.6.3-arm64-darwin)
206202
pg (1.6.3-x86_64-linux)
207203
pp (0.6.3)
@@ -379,14 +375,14 @@ GEM
379375
PLATFORMS
380376
arm64-darwin
381377
arm64-darwin-22
382-
ruby
383378
x86_64-linux
384379

385380
DEPENDENCIES
386381
awesome_spawn (~> 1.6)
387382
concurrent-ruby (< 1.3.5)
388383
config
389384
default_value_for (~> 4.0)
385+
drb
390386
factory_bot_rails
391387
faraday
392388
faraday-http-cache (~> 2.5.0)
@@ -398,6 +394,7 @@ DEPENDENCIES
398394
manageiq-style (~> 1.5, >= 1.5.6)
399395
minigit (~> 0.0.4)
400396
more_core_extensions (~> 4.4)
397+
mutex_m
401398
net-ssh (~> 7.3.0)
402399
octokit (~> 4.25.0)
403400
pg
@@ -415,7 +412,7 @@ DEPENDENCIES
415412
webmock
416413

417414
RUBY VERSION
418-
ruby 3.1.6p260
415+
ruby 3.3.10p183
419416

420417
BUNDLED WITH
421-
2.4.22
418+
2.7.2

spec/spec_helper.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
require 'simplecov'
2+
SimpleCov.start
3+
14
# This file is copied to spec/ when you run 'rails generate rspec:install'
25
ENV["RAILS_ENV"] ||= 'test'
36
require File.expand_path("../../config/environment", __FILE__)

0 commit comments

Comments
 (0)