Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#8031] Drop support for Ruby 3.0 #8348

Merged
merged 1 commit into from
Aug 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ jobs:
fail-fast: false
matrix:
include:
- { ruby: '3.0', postgres: 13.5 }
- { ruby: '3.1', postgres: 13.5 }
- { ruby: '3.2', postgres: 13.5 }

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.0
ruby-version: 3.1

- name: Run RuboCop linter
uses: reviewdog/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion .ruby-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ require:
- "./lib/custom_cops/empty_lines_around_rescued_exceptions.rb"

AllCops:
TargetRubyVersion: 3.0
TargetRubyVersion: 3.1
RubyInterpreters:
- ruby
- rake
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ see [the project website](http://alaveteli.org) for instructions on installing A

Every Alaveteli commit is tested by GitHub Actions on the [following Ruby platforms](https://github.com/mysociety/alaveteli/blob/develop/.github/workflows/ci.yml#L27-L29)

* ruby-3.0
* ruby-3.1
* ruby-3.2

Expand Down
4 changes: 4 additions & 0 deletions doc/CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Highlighted Features

* Drop support for Ruby 3.0 (Graeme Porteous)
* Allow projects owners to publish datasets (Graeme Porteous)
* Add comment deletion (Helen Cross, Graeme Porteous, Gareth Rees)
* Show and allow creation of citations from info request batch pages (Graeme
Expand Down Expand Up @@ -83,6 +84,9 @@

## Upgrade Notes

* _Required:_ This upgrade requires upgrading Ruby from 3.0 to 3.1 or later.
We recommend upgrading to the Ruby 3.2.

* _Required:_ To migrate to the new `Category` feature, please run:

bin/rails temp:migrate_public_body_categories
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
context: .
dockerfile: docker/Dockerfile
args:
RUBY_VERSION: '${RUBY_VERSION:-3.0}'
RUBY_VERSION: '${RUBY_VERSION:-3.1}'
command: bundle exec sidekiq
volumes:
- ./:/alaveteli
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG RUBY_VERSION=3.0
ARG RUBY_VERSION=3.1
FROM ruby:${RUBY_VERSION}-bullseye

ENV DOCKER 1
Expand Down
2 changes: 1 addition & 1 deletion gems/excel_analyzer/excel_analyzer.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
spec.summary = "File analysers for ActiveStorage"
spec.description = "Extra ActiveStorage Analysers for Alaveteli"
spec.homepage = "https://alaveteli.org"
spec.required_ruby_version = ">= 3.0.0"
spec.required_ruby_version = ">= 3.1.0"

spec.metadata["homepage_uri"] = spec.homepage

Expand Down
8 changes: 4 additions & 4 deletions lib/tasks/config_files.rake
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace :config_files do
cpus: ENV.fetch('CPUS') { '1' },
mailto: ENV.fetch('MAILTO') { "#{ ENV['DEPLOY_USER'] }@localhost" },
rails_env: ENV.fetch('RAILS_ENV') { 'development' },
ruby_version: ENV.fetch('RUBY_VERSION') { '3.0.4' },
ruby_version: ENV.fetch('RUBY_VERSION') { '3.1.5' },
site: ENV.fetch('SITE') { 'foi' },
user: ENV.fetch('DEPLOY_USER') { 'alaveteli' },
vcspath: ENV.fetch('VCSPATH') { 'alaveteli' },
Expand Down Expand Up @@ -123,7 +123,7 @@ namespace :config_files do
'VCSPATH=alaveteli ' \
'SITE=alaveteli ' \
'SCRIPT_FILE=config/sysvinit-thin.example ' \
'RUBY_VERSION=3.0.4 ' \
'RUBY_VERSION=3.1.5 ' \
'USE_RBENV=false '
check_for_env_vars(%w[DEPLOY_USER VHOST_DIR SCRIPT_FILE], example)

Expand All @@ -147,7 +147,7 @@ namespace :config_files do
'VCSPATH=alaveteli ' \
'SITE=alaveteli ' \
'DAEMON=alert-tracks.service ' \
'RUBY_VERSION=3.0.4 ' \
'RUBY_VERSION=3.1.5 ' \
'USE_RBENV=false '
check_for_env_vars(%w[DEPLOY_USER VHOST_DIR DAEMON], example)

Expand All @@ -167,7 +167,7 @@ namespace :config_files do
'VHOST_DIR=/dir/above/alaveteli VCSPATH=alaveteli ' \
'SITE=alaveteli CRONTAB=config/crontab-example ' \
'[email protected] ' \
'RUBY_VERSION=3.0.4 ' \
'RUBY_VERSION=3.1.5 ' \
'USE_RBENV=false '
check_for_env_vars(%w[DEPLOY_USER VHOST_DIR VCSPATH SITE CRONTAB], example)
convert_erb(ENV['CRONTAB'], **default_replacements)
Expand Down
Loading