Skip to content

Commit fb861b1

Browse files
seanmarciaarmahillo
authored andcommitted
Upgrade the ruby version to 2.6.4 including the deployment files. I have already updated the servers to have the newest version so once merged we should be able to deploy normally (#1223)
1 parent 5a447be commit fb861b1

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.6.2
1+
2.6.4

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ git_source(:github) do |repo_name|
55
"https://github.com/#{repo_name}.git"
66
end
77

8-
ruby "2.6.2"
8+
ruby "2.6.4"
99

1010
gem "api-auth", "~> 2.3"
1111
gem "bootstrap-sass"

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,7 @@ DEPENDENCIES
563563
yajl-ruby
564564

565565
RUBY VERSION
566-
ruby 2.6.2p47
566+
ruby 2.6.4p104
567567

568568
BUNDLED WITH
569-
1.17.2
569+
1.17.3

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ This project took what we built for the [Portland Diaper Bank in 2016](https://g
1919
The `ubuntu_installation.md` file ([https://github.com/rubyforgood/diaper/blob/master/ubuntu-installation.md](https://github.com/rubyforgood/diaper/blob/master/ubuntu-installation.md)) has detailed instructions for installation and configuration of an Ubuntu host to run this software. Although there is not a document for Mac OS, it may be helpful for that as well.
2020

2121
### Ruby Version
22-
This app uses Ruby version 2.6.2, indicated in `/.ruby-version` and `Gemfile`, which will be auto-selected if you use a Ruby versioning manager like `rvm`, `rbenv`, or `asdf`.
22+
This app uses Ruby version 2.6.4, indicated in `/.ruby-version` and `Gemfile`, which will be auto-selected if you use a Ruby versioning manager like `rvm`, `rbenv`, or `asdf`.
2323

2424
### Yarn Installation
2525
If you don't have Yarn installed, you can install with Homebrew on macOS `brew install yarn` or visit [https://yarnpkg.com/en/docs/install](https://yarnpkg.com/en/docs/install). Be sure to run `yarn install` after installing Yarn. NOTE: It's possible that Node version 12 may cause you problems, see issue #751. Node 10 or 11 seem to be fine.
@@ -113,7 +113,7 @@ Sometimes we want to get a PR up there and going so that other people can review
113113
* The generated `schema.rb` file may include or omit `id: :serial` for `create table`, and `null: false` for `t.datetime`. According to Aaron, this can safely be ignored, and it is probably best to commit the schema.rb only if you have committed anything that would change the DB schema (i.e. a migration).
114114
* If you have trouble relating to SSL libraries installing Ruby using `rvm` or `rbenv` on a Mac, you may need to add a command line option to specify the location of the SSL libraries. Assuming you are using `brew`, this will probably result in a command looking something like:
115115

116-
```rvm install 2.6.2 --with-openssl-dir=`brew --prefix openssl` ```.
116+
```rvm install 2.6.4 --with-openssl-dir=`brew --prefix openssl` ```.
117117

118118
### Becoming a Repo Contributor
119119

config/deploy/production.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
# Feel free to add new variables to customise your setup.
3939

4040
set :rvm_type, :user
41-
set :rvm_ruby_version, "2.6.2"
41+
set :rvm_ruby_version, "2.6.4"
4242
# Custom SSH Options
4343
# ==================
4444
# You may pass any option but keep in mind that net/ssh understands a

0 commit comments

Comments
 (0)