Browse Source

Maintenance: Apply Ruby 3.2.4 security update.

Martin Gruner 10 months ago
parent
commit
da6f38e939

+ 1 - 1
.gitlab/ci/__includes__/job_defaults.yml

@@ -1,5 +1,5 @@
 default:
-  image: $CI_REGISTRY/docker/zammad-ci:3.2.3
+  image: $CI_REGISTRY/docker/zammad-ci:3.2.4
 
   tags:
     - docker

+ 2 - 2
.gitlab/ci/test/migration.yml

@@ -18,13 +18,13 @@
     - git fetch --unshallow
     - git checkout stable
     - !reference [.scripts, source_rvm]
-    # - rvm use 3.1.3
+    - rvm use 3.2.3
     - !reference [.scripts, bundle_install]
     - !reference [.scripts, configure_environment]
     - !reference [.scripts, zammad_db_init]
     # Then, switch to the current commit, migrate to it and run a few selected tests.
     - git checkout $CI_COMMIT_SHA
-    # - rvm use 3.2.3
+    - rvm use 3.2.4
     - !reference [.scripts, bundle_install]
     # Force redis usage, even if it was disabled by the initial configure_environment script of stable.
     - export REDIS_URL=redis://redis

+ 1 - 1
.ruby-version

@@ -1 +1 @@
-3.2.3
+3.2.4

+ 2 - 2
Dockerfile

@@ -1,7 +1,7 @@
 FROM node:20-slim as node
 
 
-FROM ruby:3.2.3-slim AS builder
+FROM ruby:3.2.4-slim AS builder
 ARG DEBIAN_FRONTEND=noninteractive
 ARG RAILS_ENV=production
 ARG ZAMMAD_DIR=/opt/zammad
@@ -15,7 +15,7 @@ RUN contrib/docker/setup.sh builder
 
 # note: zammad is currently incompatible to alpine because of:
 # https://github.com/docker-library/ruby/issues/113
-FROM ruby:3.2.3-slim
+FROM ruby:3.2.4-slim
 ARG DEBIAN_FRONTEND=noninteractive
 ARG ZAMMAD_USER=zammad
 ENV RAILS_ENV=production

+ 1 - 1
Gemfile

@@ -3,7 +3,7 @@
 source 'https://rubygems.org'
 
 # core - base
-ruby '3.2.3'
+ruby '3.2.4'
 gem 'rails', '~> 7.0.8'
 
 # core - rails additions

+ 1 - 1
Gemfile.lock

@@ -854,7 +854,7 @@ DEPENDENCIES
   zendesk_api
 
 RUBY VERSION
-   ruby 3.2.3p157
+   ruby 3.2.4p170
 
 BUNDLED WITH
    2.4.1

+ 2 - 2
doc/developer_manual/development_environment/how-to-set-up-a-development-environment.md

@@ -55,8 +55,8 @@ For Linux and macOS:
 
 ```screen
 curl -sSL https://get.rvm.io | bash -s stable --rails
-rvm install ruby-3.2.3
-rvm --default use 3.2.3
+rvm install ruby-3.2.4
+rvm --default use 3.2.4
 ```
 
 ## NVM, Node.js and Yarn

+ 1 - 1
lib/auto_wizard.rb

@@ -35,7 +35,7 @@ returns
 
   def self.data
     auto_wizard_file_location = file_location
-    raise "So such file #{auto_wizard_file_location}" if !File.file?(auto_wizard_file_location)
+    raise "The required file #{auto_wizard_file_location} was not found." if !File.file?(auto_wizard_file_location)
 
     JSON.parse(File.read(auto_wizard_file_location))
   end