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
31 changes: 20 additions & 11 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ workflows:
matrix:
parameters:
ruby-version:
- '2.7'
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test matrix exceeded the limit. I think it's fine to stop testing older ruby versions. We won't necessarily drop support now, but if we ever get a report of a failure, we can drop support then instead of fixing it. WDYT @00dav00

- '3.0'
- '3.1'
- '3.2'
- '3.3'
- '3.4'
gemfile:
- gemfiles/rails6.1_graphql1.11.gemfile
- gemfiles/rails6.1_graphql1.12.gemfile
Expand All @@ -68,17 +68,10 @@ workflows:
- gemfiles/rails7.2_graphql2.2.gemfile
- gemfiles/rails7.2_graphql2.3.gemfile
- gemfiles/rails7.2_graphql2.4.gemfile
- gemfiles/rails8.0_graphql2.2.gemfile
- gemfiles/rails8.0_graphql2.3.gemfile
- gemfiles/rails8.0_graphql2.4.gemfile
exclude:
- ruby-version: '2.7'
gemfile: gemfiles/rails7.2_graphql2.0.gemfile
- ruby-version: '2.7'
gemfile: gemfiles/rails7.2_graphql2.1.gemfile
- ruby-version: '2.7'
gemfile: gemfiles/rails7.2_graphql2.2.gemfile
- ruby-version: '2.7'
gemfile: gemfiles/rails7.2_graphql2.3.gemfile
- ruby-version: '2.7'
gemfile: gemfiles/rails7.2_graphql2.4.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails7.2_graphql2.0.gemfile
- ruby-version: '3.0'
Expand All @@ -89,6 +82,18 @@ workflows:
gemfile: gemfiles/rails7.2_graphql2.3.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails7.2_graphql2.4.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails8.0_graphql2.2.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails8.0_graphql2.3.gemfile
- ruby-version: '3.0'
gemfile: gemfiles/rails8.0_graphql2.4.gemfile
- ruby-version: '3.1'
gemfile: gemfiles/rails8.0_graphql2.2.gemfile
- ruby-version: '3.1'
gemfile: gemfiles/rails8.0_graphql2.3.gemfile
- ruby-version: '3.1'
gemfile: gemfiles/rails8.0_graphql2.4.gemfile
- ruby-version: '3.2'
gemfile: gemfiles/rails6.1_graphql1.11.gemfile
- ruby-version: '3.2'
Expand All @@ -97,6 +102,10 @@ workflows:
gemfile: gemfiles/rails6.1_graphql1.11.gemfile
- ruby-version: '3.3'
gemfile: gemfiles/rails7.0_graphql1.11.gemfile
- ruby-version: '3.4'
gemfile: gemfiles/rails6.1_graphql1.11.gemfile
- ruby-version: '3.4'
gemfile: gemfiles/rails7.0_graphql1.11.gemfile
- report-coverage:
requires:
- test
44 changes: 15 additions & 29 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -1,32 +1,3 @@
appraise 'rails6.0-graphql1.11' do
gem 'psych', '< 4'
gem 'sqlite3', '~> 1.5.4'
gem 'public_suffix', '< 5'
gem 'devise', '>= 4.7'
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
gem 'graphql', '~> 1.11.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails6.0-graphql1.12' do
gem 'psych', '< 4'
gem 'sqlite3', '~> 1.5.4'
gem 'public_suffix', '< 5'
gem 'devise', '>= 4.7'
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
gem 'graphql', '~> 1.12.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails6.0-graphql1.13' do
gem 'psych', '< 4'
gem 'sqlite3', '~> 1.5.4'
gem 'devise', '>= 4.7'
gem 'rails', git: 'https://github.com/rails/rails', branch: '6-0-stable'
gem 'graphql', '~> 1.13.0'
gem 'factory_bot', '<= 6.4.4'
end

appraise 'rails6.1-graphql1.10' do
gem 'sqlite3', '~> 1.5.4'
gem 'devise', '>= 4.7'
Expand Down Expand Up @@ -226,3 +197,18 @@ appraise 'rails7.2-graphql2.4' do
gem 'rails', git: 'https://github.com/rails/rails', branch: '7-2-stable'
gem 'graphql', '>= 2.4', '< 2.5'
end

appraise 'rails8.0-graphql2.2' do
gem 'rails', git: 'https://github.com/rails/rails', branch: '8-0-stable'
gem 'graphql', '>= 2.2', '< 2.3'
end

appraise 'rails8.0-graphql2.3' do
gem 'rails', git: 'https://github.com/rails/rails', branch: '8-0-stable'
gem 'graphql', '>= 2.3', '< 2.4'
end

appraise 'rails8.0-graphql2.4' do
gem 'rails', git: 'https://github.com/rails/rails', branch: '8-0-stable'
gem 'graphql', '>= 2.4', '< 2.5'
end
13 changes: 0 additions & 13 deletions gemfiles/rails6.0_graphql1.11.gemfile

This file was deleted.

13 changes: 0 additions & 13 deletions gemfiles/rails6.0_graphql1.12.gemfile

This file was deleted.

12 changes: 0 additions & 12 deletions gemfiles/rails6.0_graphql1.13.gemfile

This file was deleted.

8 changes: 8 additions & 0 deletions gemfiles/rails8.0_graphql2.2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", git: "https://github.com/rails/rails", branch: "8-0-stable"
gem "graphql", ">= 2.2", "< 2.3"

gemspec path: "../"
8 changes: 8 additions & 0 deletions gemfiles/rails8.0_graphql2.3.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", git: "https://github.com/rails/rails", branch: "8-0-stable"
gem "graphql", ">= 2.3", "< 2.4"

gemspec path: "../"
8 changes: 8 additions & 0 deletions gemfiles/rails8.0_graphql2.4.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", git: "https://github.com/rails/rails", branch: "8-0-stable"
gem "graphql", ">= 2.4", "< 2.5"

gemspec path: "../"
2 changes: 1 addition & 1 deletion graphql_devise.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Gem::Specification.new do |spec|

spec.add_dependency 'devise_token_auth', '>= 0.1.43', '< 2.0'
spec.add_dependency 'graphql', '>= 1.8', '< 2.5'
spec.add_dependency 'rails', '>= 6.0', '< 7.3'
spec.add_dependency 'rails', '>= 6.0', '< 8.1'
spec.add_dependency 'zeitwerk'

spec.add_development_dependency 'appraisal'
Expand Down
3 changes: 3 additions & 0 deletions spec/generators/graphql_devise/install_generator_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ def create_rails_project
FileUtils.cd(File.join(destination_root, '..')) do
`rails new gqld_dummy -S -C --skip-action-mailbox --skip-action-text -T --skip-spring --skip-bundle --skip-keeps -G --skip-active-storage -J --skip-listen --skip-bootsnap`
end
FileUtils.cd(File.join(destination_root, '../gqld_dummy')) do
`rm -f config/initializers/assets.rb`
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was necessary as the assets initializer is still generated, but additional setup is required to continue to support assets in Rails 8.0 and we don't need it

end
FileUtils.cd(File.join(destination_root, '../gqld_dummy')) do
`rails generate graphql:install`
end
Expand Down