Skip to content

Commit

Permalink
Refactor CI gemfiles
Browse files Browse the repository at this point in the history
  • Loading branch information
sambostock committed Feb 1, 2024
1 parent 922ee56 commit 5f3c25d
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 50 deletions.
37 changes: 19 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,44 +15,45 @@ jobs:
strategy:
matrix:
ruby: ["2.6", "2.7", "3.0", "3.1", "3.2", "3.3"]
gemfile: [rails_5_2, rails_6_0, rails_6_1, rails_7_0, rails_7_1, rails_edge]
rails:
["~> 5.2.0", "~> 6.0.0", "~> 6.1.0", "~> 7.0.0", "~> 7.1.0", "edge"]
exclude:
- ruby: "2.6"
gemfile: rails_7_0
rails: "~> 7.0.0"
- ruby: "2.6"
gemfile: rails_7_1
rails: "~> 7.1.0"
- ruby: "2.6"
gemfile: rails_edge
rails: "edge"
- ruby: "2.7"
gemfile: rails_7_1
rails: "~> 7.1.0"
- ruby: "2.7"
gemfile: rails_edge
rails: "edge"
- ruby: "3.0"
gemfile: rails_5_2
rails: "~> 5.2.0"
- ruby: "3.0"
gemfile: rails_7_1
rails: "~> 7.1.0"
- ruby: "3.0"
gemfile: rails_edge
rails: "edge"
- ruby: "3.1"
gemfile: rails_5_2
rails: "~> 5.2.0"
- ruby: "3.1"
gemfile: rails_6_0
rails: "~> 6.0.0"
- ruby: "3.2"
gemfile: rails_5_2
rails: "~> 5.2.0"
- ruby: "3.2"
gemfile: rails_6_0
rails: "~> 6.0.0"
- ruby: "3.2"
gemfile: rails_6_1
rails: "~> 6.1.0"
- ruby: "3.3"
gemfile: rails_5_2
rails: "~> 5.2.0"
- ruby: "3.3"
gemfile: rails_6_0
rails: "~> 6.0.0"
- ruby: "3.3"
gemfile: rails_6_1
rails: "~> 6.1.0"

include:
- ruby: head
gemfile: rails_edge
rails: "edge"
env:
BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
steps:
Expand Down
5 changes: 0 additions & 5 deletions gemfiles/rails_5_2.gemfile

This file was deleted.

5 changes: 0 additions & 5 deletions gemfiles/rails_6_0.gemfile

This file was deleted.

11 changes: 0 additions & 11 deletions gemfiles/rails_6_1.gemfile

This file was deleted.

5 changes: 0 additions & 5 deletions gemfiles/rails_7_0.gemfile

This file was deleted.

5 changes: 0 additions & 5 deletions gemfiles/rails_7_1.gemfile

This file was deleted.

3 changes: 2 additions & 1 deletion gemfiles/rails_edge.gemfile → gemfiles/rails_gems.gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# frozen_string_literal: true

@rails_gems_requirements = { github: "rails/rails", branch: "main" }
@rails_gems_requirements = ENV.fetch("RAILS_GEMS_REQUIREMENTS")
@rails_gems_requirements = { github: "rails/rails", branch: "main" } if @rails_gems_requirements == "edge"

eval_gemfile "../Gemfile"

0 comments on commit 5f3c25d

Please sign in to comment.