Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Heroku stack to heroku-20 and bump Ruby version to 2.5.9 #1877

Merged
merged 2 commits into from
Jul 20, 2023
Merged

Update Heroku stack to heroku-20 and bump Ruby version to 2.5.9 #1877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1445a3e
Upgrading Heroku stack to heroku-20
matyikriszta Jul 19, 2023
edbaf60
Upgrades Ruby version to 2.5.9
matyikriszta Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ruby.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2.4.2
ruby-version: 2.5.9
bundler-cache: true
env:
BUNDLE_JOBS: 4
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.4.2
2.5.9
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ruby:2.4.2
FROM ruby:2.5.9

# Default node version on apt is old. This makes sure a recent version is installed
# This step also runs apt-get update
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '2.4.2'
ruby '2.5.9'

gem 'rails', '4.2.11.3'

Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,7 @@ DEPENDENCIES
will_paginate

RUBY VERSION
ruby 2.4.2p198
ruby 2.5.9p229

BUNDLED WITH
1.17.3
9 changes: 5 additions & 4 deletions native-installation-instructions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,20 @@ These are the original instructions for natively installing the app to your mach

## Set up a Ruby Environment

You will need to install Ruby 2.4.2 using RVM or rbenv.
You will need to install Ruby 2.7.2 using RVM or rbenv.

### Option 1: Using [rvm](https://rvm.io/rvm/install)

```bash
rvm install 2.4.2
CPPFLAGS=-DUSE_FFI_CLOSURE_ALLOC rvm install 2.5.9
matyikriszta marked this conversation as resolved.
Show resolved Hide resolved
```
We need to set the CPPFLAGS env variable to be able to install Ruby 2.5.9 on M1 Mac machines. See more: [https://github.com/ffi/ffi/issues/869#issuecomment-1233000037](https://github.com/ffi/ffi/issues/869#issuecomment-1233000037)

### Option 2: Using [rbenv](https://github.com/sstephenson/rbenv) and [ruby-build](https://github.com/sstephenson/ruby-build)

```bash
rbenv install 2.4.2
rbenv global 2.4.2
rbenv install 2.5.9
rbenv global 2.5.9
```

## Install and run PostgreSQL
Expand Down