Skip to content

Commit 6edf111

Browse files
Merge pull request #11 from thoughtbot/bt/take-2-upgrade
Upgrade Pair Matchmaker to continue using heroku Heroku-18 stack which was the last one to support ruby 3.0 was deprecated last week. To keep this working I want to set us up to use heroku-22 (and then 24, if it's easy). Mostly changing deps and some syntax as well as loading some classes early
2 parents cfb4d50 + 6d9871e commit 6edf111

File tree

8 files changed

+216
-183
lines changed

8 files changed

+216
-183
lines changed

.github/workflows/ruby.yml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
66
# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
77

8-
name: Ruby
8+
name: Ruby Test n' Lint
99

1010
on:
1111
push:
@@ -24,20 +24,12 @@ jobs:
2424
POSTGRES_DB: doubleup_test
2525
ports: ["5432:5432"]
2626

27-
strategy:
28-
matrix:
29-
ruby-version: ["3.0"]
30-
3127
steps:
32-
- uses: actions/checkout@v2
33-
- name: Set up Ruby
34-
# To automatically get bug fixes and new Ruby versions for ruby/setup-ruby,
35-
# change this to (see https://github.com/ruby/setup-ruby#versioning):
36-
# uses: ruby/setup-ruby@v1
37-
uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
28+
- uses: actions/checkout@v4
29+
- uses: ruby/setup-ruby@v1
3830
with:
39-
ruby-version: ${{ matrix.ruby-version }}
4031
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
32+
- run: bundle install
4133
- name: Setup Database
4234
env:
4335
RAILS_ENV: test

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0.0
1+
3.2.8

.standard.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
ignore:
2+
- 'bundle/**/*'

Gemfile

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

4-
ruby "3.0.0"
4+
ruby "3.2.8"
55

6-
gem "rails", "~> 6.1.3", ">= 6.1.3.1"
7-
gem "puma", "~> 5.5"
6+
gem "rails", "~> 7.0.0"
7+
gem "puma"
88
gem "slack-ruby-client"
9-
gem "bootsnap", ">= 1.4.4", require: false
10-
gem "pg", "~> 1.2"
9+
gem "bootsnap", require: false
10+
gem "pg"
1111
gem "bugsnag", "~> 6.24"
1212
gem "sendgrid-actionmailer"
1313

@@ -18,8 +18,8 @@ group :development, :test do
1818
end
1919

2020
group :development do
21-
gem "rack-mini-profiler", "~> 2.0"
22-
gem "listen", "~> 3.3"
21+
gem "rack-mini-profiler"
22+
gem "listen"
2323
end
2424

2525
group :test do

0 commit comments

Comments
 (0)