Use ruby version 4.0.2 (#37445)

This commit is contained in:
Matt Jankowski
2026-03-30 06:21:36 -04:00
committed by GitHub
parent ac69a3374c
commit 52df641172
12 changed files with 16 additions and 13 deletions

View File

@@ -1,5 +1,5 @@
# For details, see https://github.com/devcontainers/images/tree/main/src/ruby # For details, see https://github.com/devcontainers/images/tree/main/src/ruby
FROM mcr.microsoft.com/devcontainers/ruby:3.4-trixie FROM mcr.microsoft.com/devcontainers/ruby:4.0-trixie
# Install node version from .nvmrc # Install node version from .nvmrc
WORKDIR /app WORKDIR /app

View File

@@ -59,7 +59,7 @@ body:
Any additional technical details you may have, like logs or error traces Any additional technical details you may have, like logs or error traces
value: | value: |
If this is happening on your own Mastodon server, please fill out those: If this is happening on your own Mastodon server, please fill out those:
- Ruby version: (from `ruby --version`, eg. v3.4.9) - Ruby version: (from `ruby --version`, eg. v4.0.2)
- Node.js version: (from `node --version`, eg. v22.16.0) - Node.js version: (from `node --version`, eg. v22.16.0)
validations: validations:
required: false required: false

View File

@@ -61,7 +61,7 @@ body:
value: | value: |
Please at least include those informations: Please at least include those informations:
- Operating system: (eg. Ubuntu 24.04.2) - Operating system: (eg. Ubuntu 24.04.2)
- Ruby version: (from `ruby --version`, eg. v3.4.9) - Ruby version: (from `ruby --version`, eg. v4.0.2)
- Node.js version: (from `node --version`, eg. v22.16.0) - Node.js version: (from `node --version`, eg. v22.16.0)
validations: validations:
required: false required: false

View File

@@ -1,4 +1,4 @@
name: 'Setup RUby' name: 'Setup Ruby'
description: 'Setup a Ruby environment ready to run the Mastodon code' description: 'Setup a Ruby environment ready to run the Mastodon code'
inputs: inputs:
ruby-version: ruby-version:
@@ -17,7 +17,7 @@ runs:
sudo apt-get install --no-install-recommends -y libicu-dev libidn11-dev libvips42 ${{ inputs.additional-system-dependencies }} sudo apt-get install --no-install-recommends -y libicu-dev libidn11-dev libvips42 ${{ inputs.additional-system-dependencies }}
- name: Set up Ruby - name: Set up Ruby
uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1 uses: ruby/setup-ruby@c984c1a20bb35a1cbda04477c816cea024418be9 # v1
with: with:
ruby-version: ${{ inputs.ruby-version }} ruby-version: ${{ inputs.ruby-version }}
bundler-cache: true bundler-cache: true

View File

@@ -31,7 +31,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
- name: Set up Ruby - name: Set up Ruby
uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1 uses: ruby/setup-ruby@c984c1a20bb35a1cbda04477c816cea024418be9 # v1
with: with:
bundler-cache: true bundler-cache: true

View File

@@ -36,7 +36,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
- name: Set up Ruby - name: Set up Ruby
uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1 uses: ruby/setup-ruby@c984c1a20bb35a1cbda04477c816cea024418be9 # v1
with: with:
bundler-cache: true bundler-cache: true

View File

@@ -38,7 +38,7 @@ jobs:
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
- name: Set up Ruby - name: Set up Ruby
uses: ruby/setup-ruby@4eb9f110bac952a8b68ecf92e3b5c7a987594ba6 # v1 uses: ruby/setup-ruby@c984c1a20bb35a1cbda04477c816cea024418be9 # v1
with: with:
bundler-cache: true bundler-cache: true

View File

@@ -125,6 +125,7 @@ jobs:
matrix: matrix:
ruby-version: ruby-version:
- '3.3' - '3.3'
- '3.4'
- '.ruby-version' - '.ruby-version'
steps: steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
@@ -217,6 +218,7 @@ jobs:
matrix: matrix:
ruby-version: ruby-version:
- '3.3' - '3.3'
- '3.4'
- '.ruby-version' - '.ruby-version'
steps: steps:
@@ -347,6 +349,7 @@ jobs:
matrix: matrix:
ruby-version: ruby-version:
- '3.3' - '3.3'
- '3.4'
- '.ruby-version' - '.ruby-version'
search-image: search-image:
- docker.elastic.co/elasticsearch/elasticsearch:7.17.29 - docker.elastic.co/elasticsearch/elasticsearch:7.17.29

View File

@@ -1 +1 @@
3.4.9 4.0.2

View File

@@ -11,9 +11,9 @@ ARG TARGETPLATFORM=${TARGETPLATFORM}
ARG BUILDPLATFORM=${BUILDPLATFORM} ARG BUILDPLATFORM=${BUILDPLATFORM}
ARG BASE_REGISTRY="docker.io" ARG BASE_REGISTRY="docker.io"
# Ruby image to use for base image, change with [--build-arg RUBY_VERSION="3.4.x"] # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="4.0.x"]
# renovate: datasource=docker depName=docker.io/ruby # renovate: datasource=docker depName=docker.io/ruby
ARG RUBY_VERSION="3.4.9" ARG RUBY_VERSION="4.0.2"
# # Node.js version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="22"] # # Node.js version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="22"]
# renovate: datasource=node-version depName=node # renovate: datasource=node-version depName=node
ARG NODE_MAJOR_VERSION="24" ARG NODE_MAJOR_VERSION="24"

View File

@@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '>= 3.3.0', '< 3.5.0' ruby '>= 3.3.0', '< 4.1.0'
gem 'propshaft' gem 'propshaft'
gem 'puma', '~> 7.0' gem 'puma', '~> 7.0'

View File

@@ -1097,7 +1097,7 @@ DEPENDENCIES
xorcist (~> 1.1) xorcist (~> 1.1)
RUBY VERSION RUBY VERSION
ruby 3.4.9 ruby 4.0.2
BUNDLED WITH BUNDLED WITH
4.0.8 4.0.8