Skip to content

Commit 0ba2e0c

Browse files
Update CI (#141)
1 parent d994658 commit 0ba2e0c

8 files changed

Lines changed: 15 additions & 25 deletions

File tree

.github/workflows/rspec.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,30 +19,23 @@ jobs:
1919
strategy:
2020
fail-fast: false
2121
matrix:
22-
ruby: [3.1, 3.2, 3.3, 3.4]
22+
ruby: [3.2, 3.3, 3.4, 4.0]
2323
gemfile: [
2424
"gemfiles/graphql_2_1_4.gemfile",
2525
"gemfiles/graphql_2_3_0.gemfile",
2626
"gemfiles/graphql_2_3_11.gemfile",
2727
"gemfiles/graphql_2_4_8.gemfile",
2828
"gemfiles/graphql_master.gemfile"
2929
]
30-
exclude:
31-
- ruby: "3.1"
32-
gemfile: gemfiles/graphql_2_3_0.gemfile
33-
- ruby: "3.1"
34-
gemfile: gemfiles/graphql_2_3_11.gemfile
35-
- ruby: "3.1"
36-
gemfile: gemfiles/graphql_master.gemfile
3730

3831
steps:
3932
- uses: actions/checkout@v2
4033
- uses: ruby/setup-ruby@v1
4134
with:
4235
ruby-version: ${{ matrix.ruby }}
4336
bundler-cache: true
44-
bundler: 2.2.0
45-
cache-version: 1
37+
bundler: 2.6.2
38+
cache-version: 2
4639
- name: Run RSpec
4740
run: |
4841
bundle exec rake spec

.github/workflows/rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
- uses: actions/checkout@v2
1515
- uses: ruby/setup-ruby@v1
1616
with:
17-
ruby-version: 3.1
17+
ruby-version: 3.2
1818
bundler-cache: true
19-
bundler: 2.2.0
19+
bundler: 2.6.2
2020
- name: Lint Ruby code with RuboCop
2121
run: |
2222
bundle install --gemfile gemfiles/rubocop.gemfile --jobs 4 --retry 3

.rubocop.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
require:
22
- standard
33
- rubocop-md
4-
- ruby-next/rubocop
54

65
inherit_gem:
76
standard: config/base.yml

gemfiles/rubocop.gemfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
source "https://rubygems.org" do
22
gem "rubocop-md", "~> 0.3"
3-
gem "standard", "1.20.0"
4-
gem "ruby-next", ">= 0.7.0"
3+
gem "standard", "1.31.0"
54
gem "base64"
65
end

graphql-ruby-fragment_cache.gemspec

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ Gem::Specification.new do |spec|
2626

2727
spec.add_development_dependency "combustion", "~> 1.1"
2828
spec.add_development_dependency "activerecord"
29+
spec.add_development_dependency "benchmark"
2930
spec.add_development_dependency "sqlite3"
3031
spec.add_development_dependency "rake", ">= 13.0"
3132
spec.add_development_dependency "rspec", "~> 3.9"
3233
spec.add_development_dependency "timecop"
3334
spec.add_development_dependency "unparser", "0.6.0"
3435
spec.add_development_dependency "graphql-batch"
3536
spec.add_development_dependency "parser"
37+
spec.add_development_dependency "ostruct"
3638
end

lib/graphql/fragment_cache/cache_key_builder.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,18 @@ def alias?(val)
4646
end
4747

4848
refine ::GraphQL::Execution::Lookahead do
49-
def selection_with_alias(name, **kwargs)
50-
return selection(name, **kwargs) if selects?(name, **kwargs)
51-
alias_selection(name, **kwargs)
49+
def selection_with_alias(name, **)
50+
return selection(name, **) if selects?(name, **)
51+
alias_selection(name, **)
5252
end
5353
end
5454
})
5555

5656
# Builds cache key for fragment
5757
class CacheKeyBuilder
5858
class << self
59-
def call(**options)
60-
new(**options).build
59+
def call(**)
60+
new(**).build
6161
end
6262
end
6363

spec/spec_helper.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
rescue LoadError
66
end
77

8-
ENV["RUBY_NEXT_TRANSPILE_MODE"] = "rewrite"
9-
require "ruby-next/language/runtime" unless ENV["CI"]
10-
118
require "graphql/batch"
129
require "graphql-fragment_cache"
1310
require "timecop"

spec/support/models/post.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ def all
1313
@store.values
1414
end
1515

16-
def create(id:, **attributes)
17-
store[id] = new(id: id, **attributes)
16+
def create(id:, **)
17+
store[id] = new(id: id, **)
1818
end
1919

2020
def delete_all

0 commit comments

Comments
 (0)