From ed04547de2baf07ebb4383370e7e8f031e79fda1 Mon Sep 17 00:00:00 2001 From: Claire Date: Fri, 3 Jan 2025 10:24:55 +0100 Subject: [PATCH] Fix Renovate by temporarily constraining it to Ruby 3.3 (#33440) --- .github/renovate.json5 | 5 +++++ Gemfile | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 8a10676283..3d3499922e 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -14,6 +14,11 @@ // If we do not want a package to be grouped with others, we need to set its groupName // to `null` after any other rule set it to something. dependencyDashboardHeader: 'This issue lists Renovate updates and detected dependencies. Read the [Dependency Dashboard](https://docs.renovatebot.com/key-concepts/dashboard/) docs to learn more. Before approving any upgrade: read the description and comments in the [`renovate.json5` file](https://github.com/mastodon/mastodon/blob/main/.github/renovate.json5).', + constraints: { + // Mastodon should work on Ruby 3.4, but its test dependencies are currently uninstallable on Ruby 3.4. + // TODO: remove this once https://github.com/briandunn/flatware/issues/103 is fixed + ruby: '3.3', + }, postUpdateOptions: ['yarnDedupeHighest'], packageRules: [ { diff --git a/Gemfile b/Gemfile index 8bee371647..e8e1e154e1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby '>= 3.2.0' +ruby '>= 3.2.0', '< 3.5' gem 'propshaft' gem 'puma', '~> 6.3'