Skip to content

Commit

Permalink
Upgrade the ruby version to 2.6.4 including the deployment files. I h…
Browse files Browse the repository at this point in the history
…ave already updated the servers to have the newest version so once merged we should be able to deploy normally (#1223)
  • Loading branch information
seanmarcia authored and armahillo committed Sep 30, 2019
1 parent 5a447be commit fb861b1
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.6.2
2.6.4
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ git_source(:github) do |repo_name|
"https://github.com/#{repo_name}.git"
end

ruby "2.6.2"
ruby "2.6.4"

gem "api-auth", "~> 2.3"
gem "bootstrap-sass"
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ DEPENDENCIES
yajl-ruby

RUBY VERSION
ruby 2.6.2p47
ruby 2.6.4p104

BUNDLED WITH
1.17.2
1.17.3
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ This project took what we built for the [Portland Diaper Bank in 2016](https://g
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.

### Ruby Version
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`.
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`.

### Yarn Installation
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.
Expand Down Expand Up @@ -113,7 +113,7 @@ Sometimes we want to get a PR up there and going so that other people can review
* 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).
* 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:

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

### Becoming a Repo Contributor

Expand Down
2 changes: 1 addition & 1 deletion config/deploy/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
# Feel free to add new variables to customise your setup.

set :rvm_type, :user
set :rvm_ruby_version, "2.6.2"
set :rvm_ruby_version, "2.6.4"
# Custom SSH Options
# ==================
# You may pass any option but keep in mind that net/ssh understands a
Expand Down

0 comments on commit fb861b1

Please sign in to comment.