cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update minimum ruby version to 3.0

Browse source
This commit is contained in:
Tom Hughes 2023-05-16 18:57:48 +01:00
parent 52296d1cad
commit 302a53d767
5 changed files with 12 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/lint.yml vendored
View file

@ -7,7 +7,7 @@ concurrency:
cancel-in-progress: true cancel-in-progress: true
env: env:
os: ubuntu-20.04 os: ubuntu-20.04
ruby: '2.7' ruby: '3.0'
jobs: jobs:
rubocop: rubocop:
name: RuboCop name: RuboCop

2
.github/workflows/tests.yml vendored
View file

@ -11,7 +11,7 @@ jobs:
strategy: strategy:
matrix: matrix:
ubuntu: [20.04, 22.04] ubuntu: [20.04, 22.04]
ruby: ['2.7', '3.0', '3.1'] ruby: ['3.0', '3.1']
runs-on: ubuntu-${{ matrix.ubuntu }} runs-on: ubuntu-${{ matrix.ubuntu }}
env: env:
RAILS_ENV: test RAILS_ENV: test

2
.rubocop.yml
View file

@ -9,7 +9,7 @@ require:
- rubocop-rake - rubocop-rake
AllCops: AllCops:
TargetRubyVersion: 2.7 TargetRubyVersion: 3.0
NewCops: enable NewCops: enable
Exclude: Exclude:
- 'vendor/**/*' - 'vendor/**/*'

7
Dockerfile
View file

@ -1,4 +1,4 @@
FROM ubuntu:20.04 FROM ubuntu:22.04
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@ -9,7 +9,6 @@ RUN apt-get update \
curl \ curl \
default-jre-headless \ default-jre-headless \
file \ file \
firefox-geckodriver \
libarchive-dev \ libarchive-dev \
libffi-dev \ libffi-dev \
libgd-dev \ libgd-dev \
@ -21,8 +20,8 @@ RUN apt-get update \
locales \ locales \
nodejs \ nodejs \
postgresql-client \ postgresql-client \
ruby2.7 \ ruby3.0 \
ruby2.7-dev \ ruby3.0-dev \
tzdata \ tzdata \
unzip \ unzip \
yarnpkg \ yarnpkg \

12
INSTALL.md
View file

@ -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). * **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). * **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 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. 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 ## Minimum requirements
* Ruby 2.7+ * Ruby 3.0+
* PostgreSQL 9.1+ * PostgreSQL 9.1+
* Bundler (see note below about [developer Ruby setup](#rbenv)) * Bundler (see note below about [developer Ruby setup](#rbenv))
* Javascript Runtime * 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 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 \ libvips-dev libxml2-dev libxslt1-dev nodejs \
build-essential git-core firefox-geckodriver \ build-essential git-core firefox-geckodriver \
postgresql postgresql-contrib libpq-dev libsasl2-dev \ postgresql postgresql-contrib libpq-dev libsasl2-dev \
libffi-dev libgd-dev libarchive-dev libbz2-dev yarnpkg libffi-dev libgd-dev libarchive-dev libbz2-dev yarnpkg
sudo gem2.7 install bundler sudo gem3.0 install bundler
``` ```
### Alternative platforms ### 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: 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 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`! * 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`!