From: Tom Hughes <tom@compton.nu>
Date: Tue, 16 May 2023 17:57:48 +0000 (+0100)
Subject: Update minimum ruby version to 3.0
X-Git-Tag: live~1269
X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/302a53d767a468a7bd4d716a1a0eba8ba38ad09b

Update minimum ruby version to 3.0
---

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 8dd3d69a5..1395cf279 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -7,7 +7,7 @@ concurrency:
   cancel-in-progress: true
 env:
   os: ubuntu-20.04
-  ruby: '2.7'
+  ruby: '3.0'
 jobs:
   rubocop:
     name: RuboCop
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 85dd23bee..cb6c100d4 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         ubuntu: [20.04, 22.04]
-        ruby: ['2.7', '3.0', '3.1']
+        ruby: ['3.0', '3.1']
     runs-on: ubuntu-${{ matrix.ubuntu }}
     env:
       RAILS_ENV: test
diff --git a/.rubocop.yml b/.rubocop.yml
index 051b7a6a7..dc2a33a35 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -9,7 +9,7 @@ require:
   - rubocop-rake
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   NewCops: enable
   Exclude:
     - 'vendor/**/*'
diff --git a/Dockerfile b/Dockerfile
index 0bd5947be..37d6edda5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -9,7 +9,6 @@ RUN apt-get update \
       curl \
       default-jre-headless \
       file \
-      firefox-geckodriver \
       libarchive-dev \
       libffi-dev \
       libgd-dev \
@@ -21,8 +20,8 @@ RUN apt-get update \
       locales \
       nodejs \
       postgresql-client \
-      ruby2.7 \
-      ruby2.7-dev \
+      ruby3.0 \
+      ruby3.0-dev \
       tzdata \
       unzip \
       yarnpkg \
diff --git a/INSTALL.md b/INSTALL.md
index ea892ae29..787c81ee7 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -9,7 +9,7 @@ are two alternatives which make it easier to get a consistent development enviro
 * **Vagrant** This installs the software into a virtual machine. For Vagrant instructions see [VAGRANT.md](VAGRANT.md).
 * **Docker** This installs the software using containerization. For Docker instructions see [DOCKER.md](DOCKER.md).
 
-These instructions are based on Ubuntu 20.04 LTS, which is the platform used by the OSMF servers.
+These instructions are based on Ubuntu 22.04 LTS, which is the platform used by the OSMF servers.
 The instructions also work, with only minor amendments, for all other current Ubuntu releases, Fedora and MacOSX
 
 We don't recommend attempting to develop or deploy this software on Windows. Some Ruby gems may not be supported. If you need to use Windows the easiest solutions in order are [Docker](DOCKER.md), [Vagrant](VAGRANT.md), and Ubuntu in a virtual machine.
@@ -22,21 +22,21 @@ of packages required before you can get the various gems installed.
 
 ## Minimum requirements
 
-* Ruby 2.7+
+* Ruby 3.0+
 * PostgreSQL 9.1+
 * Bundler (see note below about [developer Ruby setup](#rbenv))
 * Javascript Runtime
 
-These can be installed on Ubuntu 20.04 or later with:
+These can be installed on Ubuntu 22.04 or later with:
 
 ```
 sudo apt-get update
-sudo apt-get install ruby2.7 libruby2.7 ruby2.7-dev \
+sudo apt-get install ruby3.0 libruby3.0 ruby3.0-dev \
                      libvips-dev libxml2-dev libxslt1-dev nodejs \
                      build-essential git-core firefox-geckodriver \
                      postgresql postgresql-contrib libpq-dev libsasl2-dev \
                      libffi-dev libgd-dev libarchive-dev libbz2-dev yarnpkg
-sudo gem2.7 install bundler
+sudo gem3.0 install bundler
 ```
 
 ### Alternative platforms
@@ -230,7 +230,7 @@ For simplicity, this document explains how to install all the website dependenci
 
 If you choose to install Ruby and Bundler via `rbenv`, then you do not need to install the system libraries for Ruby:
 
-* For Ubuntu, you do not need to install the following packages: `ruby2.7 libruby2.7 ruby2.7-dev bundler`,
+* For Ubuntu, you do not need to install the following packages: `ruby3.0 libruby3.0 ruby3.0-dev bundler`,
 * For Fedora, you do not need to install the following packages: `ruby ruby-devel rubygem-rdoc rubygem-bundler rubygems`
 * For MacOSX, you do not need to `brew install ruby` - but make sure you've installed a version of Ruby using `rbenv` before running `gem install bundler`!