Skip to content

Commit 5bcd3f8

Browse files
committed
Merge branch 'upgrade-ruby-2.7.0'
2 parents 5dfd906 + c173410 commit 5bcd3f8

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ workflows:
1717
jobs:
1818
backend-bundle_gem_dependencies:
1919
docker:
20-
- image: circleci/ruby:2.6.5-node
20+
- image: circleci/ruby:2.7.0-node
2121
working_directory: ~/rails-react-typescript-docker-example
2222
steps:
2323
- checkout
@@ -37,7 +37,7 @@ jobs:
3737

3838
backend-test:
3939
docker:
40-
- image: circleci/ruby:2.6.5-node
40+
- image: circleci/ruby:2.7.0-node
4141
- image: circleci/postgres:9.6-alpine
4242
working_directory: ~/rails-react-typescript-docker-example
4343
steps:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
**Here is an example application with the following modern web technology stacks. With this boilerplate, you can easily start to build your own app.**
66

7-
- [Ruby](https://www.ruby-lang.org/en/) 2.6.5
7+
- [Ruby](https://www.ruby-lang.org/en/) 2.7.0
88
- [Rails](https://rubyonrails.org/) 6.0.0
99
- [React.js](https://reactjs.org/) 16.10.2
1010
- [TypeScript](https://www.typescriptlang.org/) 3.6.3

backend/.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.3
1+
2.7.0

backend/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ruby:2.6.5
1+
FROM ruby:2.7.0
22
RUN apt-get update -qq && apt-get install -y build-essential libpq-dev nodejs
33
RUN mkdir -p /myapp/backend
44
WORKDIR /myapp/backend

backend/Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

4-
ruby '2.6.5'
4+
ruby '2.7.0'
55

66
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
77
gem 'rails', '~> 6.0.1'

backend/Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ DEPENDENCIES
197197
web-console (>= 3.3.0)
198198

199199
RUBY VERSION
200-
ruby 2.6.5p114
200+
ruby 2.7.0p0
201201

202202
BUNDLED WITH
203-
1.17.3
203+
2.1.3

0 commit comments

Comments
 (0)