Skip to content

Commit

Permalink
Bump Rails from 6.1 to 7.0 (#473)
Browse files Browse the repository at this point in the history
* Upgrade Rails from 6.1 to 7.0

* Drop Rails credentials references

* Drop unused class

* Clean up docker-compose env variables

* Update readme

* Clean up app configuration

* Fetch required environment variables

* Fix test setup

* Drop unused credentials

* rails app:update

* Drop unused credentials

* Restore custom application configuration

* Move Freefeed lib to services for autoload on default configuration

* Drop unused services

* Reset Rails environment to `test` for RSpec

* `rubocop --autocorrect`

* Enable Redis on CI

* Disable Simplecov

* Set `HONEYBADGER_API_KEY`

* Set required env variables on CI

* Expose Redis port

* Fix YAML syntax

* Fix Redis host name
  • Loading branch information
dreikanter authored Jul 11, 2023
1 parent cffa9d2 commit 91514ea
Show file tree
Hide file tree
Showing 47 changed files with 516 additions and 325 deletions.
18 changes: 15 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,8 @@ jobs:
services:
postgres:
image: postgres:10
ports: ["5432:5432"]
ports:
- 5432:5432
env:
POSTGRES_USER: "postgres"
POSTGRES_PASSWORD: "postgres"
Expand All @@ -170,6 +171,15 @@ jobs:
--health-interval 10s
--health-timeout 5s
--health-retries 5
redis:
image: redis
ports:
- 6379:6379
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5
steps:
- name: Checkout sources
Expand Down Expand Up @@ -201,9 +211,11 @@ jobs:
env:
RAILS_MASTER_KEY: "${{ secrets.FEEDER_RAILS_MASTER_KEY_TEST }}"
DATABASE_URL: "postgres://postgres:postgres@localhost:5432/feeder_test"
REDIS_URL: "redis://localhost:6379/0"
RAILS_ENV: test
WITH_COVERAGE: true
DISABLE_SPRING: 1
HONEYBADGER_API_KEY: "${{ secrets.FEEDER_HONEYBADGER_API_KEY }}"
FREEFEED_TOKEN: "TEST_TOKEN"
FREEFEED_BASE_URL: "https://candy.freefeed.net"
run: |
bundle exec rails db:reset
bundle exec rails test
Expand Down
30 changes: 14 additions & 16 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

gem "puma", "~> 6.3"
gem "rails", "~> 6.0"
gem "rails", "~> 7.0"

group :development do
gem "brakeman", "~> 6.0", require: false
Expand All @@ -12,7 +12,6 @@ group :development do
gem "rubocop-factory_bot", require: false
gem "rubocop-rails", require: false
gem "rubocop-rspec", require: false
gem "spring"
gem "standard", ">= 1.0", require: false
gem "standard-performance", require: false
gem "yaml-lint", "~> 0.1.2", require: false
Expand All @@ -21,34 +20,33 @@ end
group :development, :test do
gem "annotate", "~> 3.2"
gem "database_cleaner-active_record"
gem "factory_bot_rails", "~> 4.8", ">= 4.8.2"
gem "factory_bot_rails", "~> 6.2"
gem "listen", "~> 3.2"
gem "marginalia", "~> 1.5"
gem "minitest-rails", "~> 6.0"
gem "mocha", "~> 1.9"
gem "rspec-rails", "~> 6.0.0"
gem "minitest-rails", "~> 7.0"
gem "mocha", "~> 2.0"
gem "rspec-rails", "~> 6.0"
gem "simplecov", "~> 0.21"
gem "webmock", "~> 3.11"
gem "webmock", "~> 3.18"
end

gem "aasm", "~> 5.5"
gem "active_model_serializers", "~> 0.10.9"
gem "addressable", "~> 2.8"
gem "amazing_print"
gem "bootsnap", ">= 1.4.2", require: false
gem "bootsnap", "~> 1.16", require: false
gem "callee", "~> 0.3"
gem "dotiw", "~> 5.3"
gem "dry-initializer", "~> 3.0", ">= 3.0.4"
gem "dry-types", "~> 1.5", ">= 1.5.1"
gem "dry-validation", "~> 1.7"
gem "feedjira", "~> 3.2"
gem "honeybadger", "~> 4.0"
gem "http", "~> 4.0"
gem "lograge", "~> 0.3.6"
gem "mimemagic", ">= 0.4.3"
gem "nokogiri", "~> 1.13", ">= 1.13.3"
gem "pg", "~> 1.2", ">= 1.2.3"
gem "pry", "~> 0.14.1"
gem "honeybadger", "~> 5.2"
gem "http", "~> 5.1"
gem "lograge", "~> 0.12"
gem "mimemagic", "~> 0.4"
gem "nokogiri", "~> 1.15"
gem "pg", "~> 1.5"
gem "pry", "~> 0.14"
gem "pry-byebug"
gem "pry-rails", "~> 0.3.9"
gem "redis", "~> 5.0"
Expand Down
Loading

0 comments on commit 91514ea

Please sign in to comment.