Skip to content

Commit 8fb05c0

Browse files
committed
Update CI Rubies / remove unnecessary steps
1 parent 2d0abfd commit 8fb05c0

2 files changed

Lines changed: 15 additions & 14 deletions

File tree

.github/workflows/ci.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@ on:
88
jobs:
99
sunstone:
1010
name: ActiveRecord::Filter Test
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212

1313
strategy:
14+
fail-fast: false
1415
matrix:
15-
rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
16-
ruby-version: ['3.2', '3.3', '3.4']
16+
rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
17+
ruby-version: ['3.2', '3.3', '3.4', '3.5.0-preview1']
1718
postgres-version: ['17']
1819

1920
steps:
@@ -53,13 +54,13 @@ jobs:
5354

5455
ar-postgresql:
5556
name: ActiveRecord PostgresQL Test
56-
runs-on: ubuntu-22.04
57+
runs-on: ubuntu-24.04
5758

5859
strategy:
5960
fail-fast: false
6061
matrix:
61-
rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
62-
ruby-version: ['3.3']
62+
rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
63+
ruby-version: ['3.4']
6364
postgres-version: ['17']
6465

6566
steps:
@@ -108,14 +109,14 @@ jobs:
108109
109110
ar-sqlite:
110111
name: ActiveRecord SQLite Test
111-
runs-on: ubuntu-22.04
112+
runs-on: ubuntu-24.04
112113

113114

114115
strategy:
115116
fail-fast: false
116117
matrix:
117-
rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
118-
ruby-version: ['3.3']
118+
rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
119+
ruby-version: ['3.4']
119120

120121
steps:
121122
- uses: actions/checkout@v4
@@ -152,13 +153,13 @@ jobs:
152153
153154
ar-mysql:
154155
name: ActiveRecord MySQL Test
155-
runs-on: ubuntu-22.04
156+
runs-on: ubuntu-24.04
156157

157158
strategy:
158159
fail-fast: false
159160
matrix:
160-
rails: ['7.1.5.1', '7.2.2.1', '8.0.1']
161-
ruby-version: ['3.3']
161+
rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
162+
ruby-version: ['3.4']
162163

163164
steps:
164165
- name: Install MySQL

lib/active_record/filter/filter_clause_factory.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
class ActiveRecord::Filter::FilterClauseFactory
22

33
def initialize(model, predicate_builder)
4-
@model = model
4+
@klass = model
55
@predicate_builder = predicate_builder
66
end
77

@@ -17,6 +17,6 @@ def build(filters, alias_tracker)
1717

1818
protected
1919

20-
attr_reader :model, :predicate_builder
20+
attr_reader :klass, :predicate_builder
2121

2222
end

0 commit comments

Comments
 (0)