From a969668f58971dda7d6e4e7085f982a363568478 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Thu, 17 Sep 2026 08:16:11 +0000 Subject: [PATCH] Use ruby version 4.0.7 (#40556) --- .github/ISSUE_TEMPLATE/2.server_bug_report.yml | 2 +- .github/ISSUE_TEMPLATE/3.troubleshooting.yml | 2 +- .github/actions/setup-ruby/action.yml | 2 +- .github/workflows/bundler-audit.yml | 2 +- .github/workflows/lint-haml.yml | 2 +- .github/workflows/lint-ruby.yml | 2 +- .ruby-version | 2 +- Dockerfile | 2 +- Gemfile.lock | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/2.server_bug_report.yml b/.github/ISSUE_TEMPLATE/2.server_bug_report.yml index cbc7106c0a2..0902ef930cc 100644 --- a/.github/ISSUE_TEMPLATE/2.server_bug_report.yml +++ b/.github/ISSUE_TEMPLATE/2.server_bug_report.yml @@ -59,7 +59,7 @@ body: Any additional technical details you may have, like logs or error traces value: | If this is happening on your own Mastodon server, please fill out those: - - Ruby version: (from `ruby --version`, eg. v4.0.6) + - Ruby version: (from `ruby --version`, eg. v4.0.7) - Node.js version: (from `node --version`, eg. v22.16.0) validations: required: false diff --git a/.github/ISSUE_TEMPLATE/3.troubleshooting.yml b/.github/ISSUE_TEMPLATE/3.troubleshooting.yml index c3e6f35a767..dbdd822720d 100644 --- a/.github/ISSUE_TEMPLATE/3.troubleshooting.yml +++ b/.github/ISSUE_TEMPLATE/3.troubleshooting.yml @@ -61,7 +61,7 @@ body: value: | Please at least include those informations: - Operating system: (eg. Ubuntu 24.04.2) - - Ruby version: (from `ruby --version`, eg. v4.0.6) + - Ruby version: (from `ruby --version`, eg. v4.0.7) - Node.js version: (from `node --version`, eg. v22.16.0) validations: required: false diff --git a/.github/actions/setup-ruby/action.yml b/.github/actions/setup-ruby/action.yml index 8ff28ec967d..7693423ddc2 100644 --- a/.github/actions/setup-ruby/action.yml +++ b/.github/actions/setup-ruby/action.yml @@ -24,7 +24,7 @@ runs: ${{ inputs.additional-system-dependencies }} - name: Set up Ruby - uses: ruby/setup-ruby@6e5d382445ae5590b7449d8b3bc8cb1c2c27f617 # v1 + uses: ruby/setup-ruby@984c0c890880bbf811283d6f09c4607c62d210a4 # v1 with: ruby-version: ${{ inputs.ruby-version }} bundler-cache: true diff --git a/.github/workflows/bundler-audit.yml b/.github/workflows/bundler-audit.yml index b51f792ec61..fd158a6ecce 100644 --- a/.github/workflows/bundler-audit.yml +++ b/.github/workflows/bundler-audit.yml @@ -32,7 +32,7 @@ jobs: uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6 - name: Set up Ruby - uses: ruby/setup-ruby@6e5d382445ae5590b7449d8b3bc8cb1c2c27f617 # v1 + uses: ruby/setup-ruby@984c0c890880bbf811283d6f09c4607c62d210a4 # v1 with: bundler-cache: true diff --git a/.github/workflows/lint-haml.yml b/.github/workflows/lint-haml.yml index fdb6cf1dacb..fc26d54242b 100644 --- a/.github/workflows/lint-haml.yml +++ b/.github/workflows/lint-haml.yml @@ -35,7 +35,7 @@ jobs: uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6 - name: Set up Ruby - uses: ruby/setup-ruby@6e5d382445ae5590b7449d8b3bc8cb1c2c27f617 # v1 + uses: ruby/setup-ruby@984c0c890880bbf811283d6f09c4607c62d210a4 # v1 with: bundler-cache: true diff --git a/.github/workflows/lint-ruby.yml b/.github/workflows/lint-ruby.yml index 950e5029410..6b4c53d104e 100644 --- a/.github/workflows/lint-ruby.yml +++ b/.github/workflows/lint-ruby.yml @@ -37,7 +37,7 @@ jobs: uses: actions/checkout@d23441a48e516b6c34aea4fa41551a30e30af803 # v6 - name: Set up Ruby - uses: ruby/setup-ruby@6e5d382445ae5590b7449d8b3bc8cb1c2c27f617 # v1 + uses: ruby/setup-ruby@984c0c890880bbf811283d6f09c4607c62d210a4 # v1 with: bundler-cache: true diff --git a/.ruby-version b/.ruby-version index d13e837c8ec..43beb4001b8 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -4.0.6 +4.0.7 diff --git a/Dockerfile b/Dockerfile index 74a97d9f1eb..30390999e79 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ ARG BASE_REGISTRY="docker.io" # Ruby image to use for base image, change with [--build-arg RUBY_VERSION="4.0.x"] # renovate: datasource=docker depName=docker.io/ruby -ARG RUBY_VERSION="4.0.6" +ARG RUBY_VERSION="4.0.7" # # Node.js version to use in base image, change with [--build-arg NODE_MAJOR_VERSION="22"] # renovate: datasource=node-version depName=node ARG NODE_MAJOR_VERSION="24" diff --git a/Gemfile.lock b/Gemfile.lock index 58ed0329092..c3d04c62159 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1094,7 +1094,7 @@ DEPENDENCIES xorcist (~> 1.1) RUBY VERSION - ruby 4.0.6 + ruby 4.0.7 BUNDLED WITH 4.0.20