Skip to content

Commit d885567

Browse files
committed
upgrade to rails 7.1, move from fly to many-apps
1 parent 954b66a commit d885567

File tree

106 files changed

+658
-1006
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+658
-1006
lines changed

.annotaterb.yml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
position: after
2+
show_foreign_keys: false
3+
show_indexes: false

.dockerignore

-39
This file was deleted.

.github/FUNDING.yml

-1
This file was deleted.

.github/dependabot.yml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"

.github/workflows/deploy.yml

+3-39
Original file line numberDiff line numberDiff line change
@@ -10,45 +10,9 @@ on:
1010
jobs:
1111

1212
deploy:
13-
runs-on: ubuntu-20.04
14-
env:
15-
ENVKEY: ${{ secrets.ENVKEY }}
16-
RAILS_ENV: production
17-
18-
services:
19-
postgres:
20-
image: postgres:14
21-
ports:
22-
- 5432:5432
23-
env:
24-
POSTGRES_DB: railsbump_production
25-
POSTGRES_HOST: localhost
26-
POSTGRES_PASSWORD: password
27-
POSTGRES_USER: railsbump
28-
29-
redis:
30-
image: redis
31-
options: --entrypoint redis-server
32-
ports:
33-
- 6379:6379
13+
runs-on: ubuntu-latest
3414

3515
steps:
36-
- name: Check out code
37-
uses: actions/checkout@v3
38-
39-
- name: Set up Ruby
40-
uses: ruby/setup-ruby@v1
16+
- uses: hatchboxio/github-hatchbox-deploy-action@v2
4117
with:
42-
bundler-cache: true
43-
44-
- name: Load env vars
45-
run: $(bundle show baseline)/bin/load-envkey
46-
47-
- name: Compile and sync assets
48-
run: $(bundle show baseline)/bin/sync-assets
49-
50-
- name: Set up Flyctl
51-
uses: superfly/flyctl-actions/setup-flyctl@master
52-
53-
- name: Trigger Fly deploy
54-
run: flyctl deploy --remote-only --build-arg REVISION=${{ github.sha }}
18+
deploy_key: ${{ secrets.HATCHBOX_DEPLOY_KEY }}

.node-version

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
18.14.2

Dockerfile

-84
This file was deleted.

Gemfile

+14-24
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,38 @@
1-
# frozen_string_literal: true
2-
31
source "https://rubygems.org"
42

53
ruby File.read(".ruby-version").strip
64

7-
gem "active_record_extended", "~> 3.0"
8-
gem "amazing_print", "~> 1.4", require: false
9-
gem "aws-sdk-s3", "~> 1.8"
5+
gem "amazing_print", "~> 1.5"
6+
gem "aws-sdk-s3", "~> 1.8", require: false
107
gem "baseline", github: "manuelmeurer/baseline"
11-
gem "bootsnap", "~> 1.13", require: false
12-
gem "bootstrap", "~> 5.2"
8+
gem "bootsnap", "~> 1.17", require: false
9+
gem "cssbundling-rails", "~> 1.3"
1310
gem "envkey", "~> 2.0"
1411
gem "gems", "~> 1.2"
1512
gem "git", "~> 1.12"
1613
gem "haml", "~> 6.0"
1714
gem "hiredis", "~> 0.6"
18-
gem "http", "~> 5.1"
19-
gem "importmap-rails", "~> 1.1"
15+
gem "importmap-rails", "~> 1.2"
2016
gem "kredis", "~> 1.2"
21-
gem "mini_racer", "~> 0.6" # Necessary for autoprefixer-rails, which is required by bootstrap.
22-
gem "pg", "~> 1.4"
2317
gem "postmark-rails", "~> 0.22"
18+
gem "propshaft", "~> 0.8"
2419
gem "pry-rails", "~> 0.3"
25-
gem "puma", "~> 6.0"
26-
gem "rack-cors", "~> 1.0"
20+
gem "puma", "~> 6.4"
2721
gem "rails_bootstrap_navbar", "~> 3.0"
28-
gem "rails", "~> 7.0.3"
29-
gem "redis-namespace", "~> 1.9"
30-
gem "redis", "~> 4.0"
31-
gem "sassc-rails", "~> 2.1"
22+
gem "rails-i18n", "~> 7.0"
23+
gem "rails", "~> 7.1.2"
24+
gem "redis", "~> 5.0"
3225
gem "sentry-rails", "~> 5.5"
3326
gem "sentry-sidekiq", "~> 5.5"
3427
gem "sidekiq-scheduler", "~> 4.0"
3528
gem "sidekiq", "~> 6.5"
3629
gem "sitemap_generator", "~> 6.3"
37-
gem "sprockets-rails", "~> 3.4"
38-
gem "stimulus-rails", "~> 1.1"
39-
gem "tries", "~> 0.4"
40-
gem "turbo-rails", "~> 1.1"
30+
gem "sqlite3", "~> 1.6"
31+
gem "stimulus-rails", "~> 1.3"
32+
gem "turbo-rails", "~> 1.5"
4133

4234
group :development do
43-
gem "annotate", "~> 3.0", require: false
35+
gem "annotaterb", "~> 4.4", require: false
4436
gem "better_errors", "~> 2.8"
4537
gem "binding_of_caller", "~> 1.0"
46-
gem "database_consistency", "~> 1.0", require: false
47-
gem "dockerfile-rails", "~> 1.2"
4838
end

0 commit comments

Comments
 (0)