Skip to content

Commit

Permalink
Upgrade Ruby to 2.7.1 (forem#7097) [deploy]
Browse files Browse the repository at this point in the history
* Upgrade Ruby to 2.7.1

* Use explicit version in Dockerfile

* Fix docs Gemfile
  • Loading branch information
rhymes authored Apr 6, 2020
1 parent 1703776 commit 5c17e5c
Show file tree
Hide file tree
Showing 10 changed files with 15 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .gitpod.dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM gitpod/workspace-postgres

# Install Ruby
ENV RUBY_VERSION=2.7.0
ENV RUBY_VERSION=2.7.1
RUN bash -lc "rvm install ruby-$RUBY_VERSION && rvm use ruby-$RUBY_VERSION --default"

# Install Redis.
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.0
2.7.1
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cache:
- node_modules
- $HOME/.nvm
rvm:
- 2.7.0
- 2.7.1
addons:
postgresql: '9.6'
chrome: 'stable'
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.7.0-alpine3.10
FROM ruby:2.7.1-alpine3.10

#------------------------------------------------------------------------------
#
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1020,7 +1020,7 @@ DEPENDENCIES
zonebie (~> 0.6.1)

RUBY VERSION
ruby 2.7.0p0
ruby 2.7.1p83

BUNDLED WITH
2.1.4
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<br>
<p align="center">
<a href="https://www.ruby-lang.org/en/">
<img src="https://img.shields.io/badge/Ruby-v2.7.0-green.svg" alt="ruby version">
<img src="https://img.shields.io/badge/Ruby-v2.7.1-green.svg" alt="ruby version">
</a>
<a href="http://rubyonrails.org/">
<img src="https://img.shields.io/badge/Rails-v5.2.3-brightgreen.svg" alt="rails version">
Expand Down
6 changes: 5 additions & 1 deletion docs/Gemfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
# frozen_string_literal: true

ruby_version = File.read(
File.join(File.dirname(File.dirname(__FILE__)), ".ruby-version"),
).strip

source "https://rubygems.org"
ruby "2.7.0"
ruby ruby_version

gem "activerecord", "~> 5.2.3" # Databases on Rails
gem "yard", "~> 0.9.19" # YARD is a documentation generation tool for the Ruby programming language
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/linux.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ but they have only been tested on Ubuntu 18.04._
[rbenv](https://github.com/rbenv/rbenv). Please follow their
[installation guide](https://github.com/rbenv/rbenv#installation).
1. With the Ruby version manager, install the Ruby version listed on our badge.
(ie with rbenv: `rbenv install 2.7.0`)
(ie with rbenv: `rbenv install $(cat .ruby-version)`)

For very detailed rbenv installation directions on several distros, please visit
[DigitalOcean's guide](https://www.digitalocean.com/community/tutorials/how-to-install-ruby-on-rails-with-rbenv-on-ubuntu-18-04).
Expand Down
2 changes: 1 addition & 1 deletion docs/installation/mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ title: macOS
[rbenv](https://github.com/rbenv/rbenv). Please follow their
[installation guide](https://github.com/rbenv/rbenv#installation).
2. With the Ruby version manager, install the Ruby version listed on our badge.
(i.e. with rbenv: `rbenv install 2.7.0`)
(i.e. with rbenv: `rbenv install $(cat .ruby-version)`)

### Yarn

Expand Down
4 changes: 2 additions & 2 deletions docs/installation/windows.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build
echo 'export PATH="$HOME/.rbenv/plugins/ruby-build/bin:$PATH"' >> ~/.bashrc
exec $SHELL

rbenv install 2.7.0
rbenv global 2.7.0
rbenv install $(cat .ruby-version)
rbenv global $(cat .ruby-version)
ruby -v
```

Expand Down

0 comments on commit 5c17e5c

Please sign in to comment.