Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,15 @@ on:
- main

jobs:
test-rails-current:
test:
name: Test (${{ matrix.gemfile }})
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
gemfile: [Gemfile, Gemfile.next]
env:
BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
services:
postgres:
image: postgres:11.6-alpine
Expand Down Expand Up @@ -42,7 +49,7 @@ jobs:
env:
RAILS_ENV: test
run: |
gem install bundler:2.3.23
gem install bundler:2.5.22
bundle install --jobs 4 --retry 3
yarn install
bundle exec rake db:setup
Expand Down
16 changes: 12 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,23 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby "3.3.14"

def next?
File.basename(__FILE__) == "Gemfile.next"
end

gem "next_rails"

# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.0.4"
if next?
gem "rails", "~> 8.1.0"
else
gem "rails", "~> 8.0.0"
end

# Application Dependencies
gem "dotenv-rails"
gem "mechanize"
gem "sitemap-parser", github: "fastruby/sitemap-parser",
branch: "fixes/recurse-to-level-n"
gem "sitemap-parser"
gem "ombu_labs-shortener"
gem "ombu_labs-auth"

Expand Down Expand Up @@ -82,7 +91,6 @@ group :development, :test do
gem "rubocop-rails"
gem "reek"
gem "overcommit", "0.57.0"
gem "next_rails"
end
gem "dotenv_validator"
gem "pagy"
Loading
Loading