diff --git a/.github/workflows/test-ruby.yml b/.github/workflows/test-ruby.yml index 770cd72a1b..6f24c6221c 100644 --- a/.github/workflows/test-ruby.yml +++ b/.github/workflows/test-ruby.yml @@ -124,7 +124,6 @@ jobs: fail-fast: false matrix: ruby-version: - - '3.2' - '.ruby-version' steps: - uses: actions/checkout@v4 @@ -225,7 +224,6 @@ jobs: fail-fast: false matrix: ruby-version: - - '3.2' - '.ruby-version' steps: - uses: actions/checkout@v4 @@ -303,7 +301,6 @@ jobs: fail-fast: false matrix: ruby-version: - - '3.2' - '.ruby-version' steps: @@ -419,7 +416,6 @@ jobs: fail-fast: false matrix: ruby-version: - - '3.2' - '.ruby-version' search-image: - docker.elastic.co/elasticsearch/elasticsearch:7.17.13 diff --git a/.rubocop.yml b/.rubocop.yml index ebeed6ea49..1bc90ffd54 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -8,7 +8,7 @@ AllCops: - lib/mastodon/migration_helpers.rb ExtraDetails: true NewCops: enable - TargetRubyVersion: 3.2 # Oldest supported ruby version + TargetRubyVersion: 3.3 # Oldest supported ruby version inherit_from: - .rubocop/layout.yml diff --git a/Gemfile b/Gemfile index 6abb075c1c..be9cb43711 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,7 @@ # frozen_string_literal: true source 'https://rubygems.org' -ruby '>= 3.2.0' +ruby file: '.ruby-version' gem 'propshaft' gem 'puma', '~> 6.3' diff --git a/README.md b/README.md index 17d9eefb57..ab5b0de753 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,7 @@ Mastodon acts as an OAuth2 provider, so 3rd party apps can use the REST and Stre - **PostgreSQL** 12+ - **Redis** 4+ -- **Ruby** 3.2+ +- **Ruby** 3.3+ - **Node.js** 18+ The repository includes deployment configurations for **Docker and docker-compose** as well as specific platforms like **Heroku**, and **Scalingo**. For Helm charts, reference the [mastodon/chart repository](https://github.com/mastodon/chart). The [**standalone** installation guide](https://docs.joinmastodon.org/admin/install/) is available in the documentation.