diff --git a/.ruby-version b/.ruby-version index 0aec50e6e..944880fa1 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.1.4 +3.2.0 diff --git a/Containerfile b/Containerfile index 98d1b08c2..b74127c67 100644 --- a/Containerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/forem/ruby:3.1.4@sha256:d072fde5b0bb0f1374e308f7fcf1283e379e2a28a61f6e56df87b25a7dfdd5bf as base +FROM ghcr.io/forem/ruby:3.2.0@sha256:5e32bb36c5b96fda0db3c9d6cc56eb90b1eb7a8618c6d7690139ec5e0ce41386 as base FROM base as builder diff --git a/Containerfile.base b/Containerfile.base index 706897588..1023b0ccd 100644 --- a/Containerfile.base +++ b/Containerfile.base @@ -1,4 +1,4 @@ -ARG RUBY_VERSION=3.1.4 +ARG RUBY_VERSION=3.2.0 ARG DEBIAN_VERSION=bullseye FROM public.ecr.aws/docker/library/ruby:${RUBY_VERSION}-slim-${DEBIAN_VERSION} AS ruby-upstream diff --git a/Gemfile b/Gemfile index bcccaa6aa..e11c2c961 100644 --- a/Gemfile +++ b/Gemfile @@ -146,7 +146,7 @@ group :development, :test do gem "knapsack_pro", "~> 5.1" # Help parallelize Ruby spec builds gem "pry", "~> 0.14" # An IRB alternative and runtime developer console gem "pry-rails", "~> 0.3" # Use Pry as your rails console - gem "rspec-rails", "~> 6.0" # rspec-rails is a testing framework for Rails 3+ + gem "rspec-rails", "~> 6.0", ">= 6.0.3" # rspec-rails is a testing framework for Rails 3+ gem "rspec_junit_formatter", "~> 0.6" # RSpec formatter for JUnit XML output gem "rswag-specs", "~> 2.5.1" # RSwag - Swagger-based DSL for rspec & accompanying rake task for generating Swagger files gem "rubocop", "~> 1.42", require: false # Automatic Ruby code style checking tool diff --git a/Gemfile.lock b/Gemfile.lock index 9e9e356d8..f41349565 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -717,29 +717,29 @@ GEM webpush (~> 1.0) rpush-redis (1.2.0) modis (>= 3.0, < 5.0) - rspec (3.11.0) - rspec-core (~> 3.11.0) - rspec-expectations (~> 3.11.0) - rspec-mocks (~> 3.11.0) - rspec-core (3.11.0) - rspec-support (~> 3.11.0) - rspec-expectations (3.11.1) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-mocks (3.11.2) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.11.0) - rspec-rails (6.0.1) + rspec-support (~> 3.12.0) + rspec-rails (6.0.3) actionpack (>= 6.1) activesupport (>= 6.1) railties (>= 6.1) - rspec-core (~> 3.11) - rspec-expectations (~> 3.11) - rspec-mocks (~> 3.11) - rspec-support (~> 3.11) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) rspec-retry (0.6.2) rspec-core (> 3.3) - rspec-support (3.11.1) + rspec-support (3.12.1) rspec_junit_formatter (0.6.0) rspec-core (>= 2, < 4, != 2.12.0) rss (0.2.9) @@ -1082,7 +1082,7 @@ DEPENDENCIES rouge (~> 4.2) rpush (~> 7.0) rpush-redis (~> 1.1) - rspec-rails (~> 6.0) + rspec-rails (~> 6.0, >= 6.0.3) rspec-retry (~> 0.6) rspec_junit_formatter (~> 0.6) rss (~> 0.2.9) @@ -1129,7 +1129,7 @@ DEPENDENCIES zonebie (~> 0.6.1) RUBY VERSION - ruby 3.1.4p223 + ruby 3.2.0p0 BUNDLED WITH 2.4.17 diff --git a/uffizzi/Dockerfile b/uffizzi/Dockerfile index 74dddae0f..57e6a964b 100644 --- a/uffizzi/Dockerfile +++ b/uffizzi/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/forem/ruby:3.1.4@sha256:d072fde5b0bb0f1374e308f7fcf1283e379e2a28a61f6e56df87b25a7dfdd5bf as base +FROM ghcr.io/forem/ruby:3.2.0@sha256:5e32bb36c5b96fda0db3c9d6cc56eb90b1eb7a8618c6d7690139ec5e0ce41386 as base FROM base as builder diff --git a/vendor/cache/rspec-3.11.0.gem b/vendor/cache/rspec-3.11.0.gem deleted file mode 100644 index 2073e5bed..000000000 Binary files a/vendor/cache/rspec-3.11.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-3.12.0.gem b/vendor/cache/rspec-3.12.0.gem new file mode 100644 index 000000000..a28e4c33b Binary files /dev/null and b/vendor/cache/rspec-3.12.0.gem differ diff --git a/vendor/cache/rspec-core-3.11.0.gem b/vendor/cache/rspec-core-3.11.0.gem deleted file mode 100644 index 79cf601fa..000000000 Binary files a/vendor/cache/rspec-core-3.11.0.gem and /dev/null differ diff --git a/vendor/cache/rspec-core-3.12.2.gem b/vendor/cache/rspec-core-3.12.2.gem new file mode 100644 index 000000000..1f51c523c Binary files /dev/null and b/vendor/cache/rspec-core-3.12.2.gem differ diff --git a/vendor/cache/rspec-expectations-3.11.1.gem b/vendor/cache/rspec-expectations-3.11.1.gem deleted file mode 100644 index 455998f27..000000000 Binary files a/vendor/cache/rspec-expectations-3.11.1.gem and /dev/null differ diff --git a/vendor/cache/rspec-expectations-3.12.3.gem b/vendor/cache/rspec-expectations-3.12.3.gem new file mode 100644 index 000000000..102f128ce Binary files /dev/null and b/vendor/cache/rspec-expectations-3.12.3.gem differ diff --git a/vendor/cache/rspec-mocks-3.11.2.gem b/vendor/cache/rspec-mocks-3.11.2.gem deleted file mode 100644 index d23ea809f..000000000 Binary files a/vendor/cache/rspec-mocks-3.11.2.gem and /dev/null differ diff --git a/vendor/cache/rspec-mocks-3.12.6.gem b/vendor/cache/rspec-mocks-3.12.6.gem new file mode 100644 index 000000000..0a5da8275 Binary files /dev/null and b/vendor/cache/rspec-mocks-3.12.6.gem differ diff --git a/vendor/cache/rspec-rails-6.0.1.gem b/vendor/cache/rspec-rails-6.0.1.gem deleted file mode 100644 index f6fdff89a..000000000 Binary files a/vendor/cache/rspec-rails-6.0.1.gem and /dev/null differ diff --git a/vendor/cache/rspec-rails-6.0.3.gem b/vendor/cache/rspec-rails-6.0.3.gem new file mode 100644 index 000000000..7dcd9551e Binary files /dev/null and b/vendor/cache/rspec-rails-6.0.3.gem differ diff --git a/vendor/cache/rspec-support-3.11.1.gem b/vendor/cache/rspec-support-3.11.1.gem deleted file mode 100644 index b85e26e98..000000000 Binary files a/vendor/cache/rspec-support-3.11.1.gem and /dev/null differ diff --git a/vendor/cache/rspec-support-3.12.1.gem b/vendor/cache/rspec-support-3.12.1.gem new file mode 100644 index 000000000..8686557a7 Binary files /dev/null and b/vendor/cache/rspec-support-3.12.1.gem differ