Skip to content

Commit 0f3c068

Browse files
committed
Update CI
1 parent d0edde1 commit 0f3c068

2 files changed

Lines changed: 43 additions & 20 deletions

File tree

.github/workflows/ci.yml

Lines changed: 43 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,17 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
rails: ['7.2.2.1', '8.0.2']
17-
ruby-version: ['3.2', '3.3', '3.4', '3.5.0-preview1']
18-
postgres-version: ['17']
16+
rails-version:
17+
- 7.1
18+
- 7.2
19+
- 8.0
20+
- 8.1
21+
ruby-version:
22+
- 3.3
23+
- 3.4
24+
- 4.0
25+
postgres-version:
26+
- 18
1927

2028
steps:
2129
- name: Install Postgresql
@@ -35,7 +43,7 @@ jobs:
3543
- uses: actions/checkout@v4
3644

3745
- name: Fix activerecord-postgis-adapter
38-
if: ${{ matrix.rails == '8.0.1' }}
46+
if: ${{ matrix.rails-version == '8.0.1' }}
3947
run: |
4048
echo "gem 'activerecord-postgis-adapter', github: 'rgeo/activerecord-postgis-adapter'" >> Gemfile
4149
@@ -45,7 +53,7 @@ jobs:
4553
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
4654

4755
- run: |
48-
sed -i -e "s/spec.add_runtime_dependency *'activerecord', *'>= [[:digit:]]\+\(\.[[:digit:]]\+\)*'/spec.add_runtime_dependency 'activerecord', '${{ matrix.rails }}'/" activerecord-filter.gemspec
56+
sed -i -e "s/spec.add_runtime_dependency *'activerecord', *'>= [[:digit:]]\+\(\.[[:digit:]]\+\)*'/spec.add_runtime_dependency 'activerecord', '${{ matrix.rails-version }}'/" activerecord-filter.gemspec
4957
cat activerecord-filter.gemspec
5058
rm Gemfile.lock
5159
bundle
@@ -59,13 +67,19 @@ jobs:
5967
strategy:
6068
fail-fast: false
6169
matrix:
62-
rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
63-
ruby-version: ['3.4']
64-
postgres-version: ['17']
70+
rails-version:
71+
- 7.1.6
72+
- 7.2.3
73+
- 8.0.4
74+
- 8.1.1
75+
ruby-version:
76+
- 3.4
77+
postgres-version:
78+
- 18
6579
exclude:
66-
- rails: '7.1.5.1'
80+
- rails-version: '7.1.6'
6781
ruby-version: '3.4'
68-
postgres-version: '17'
82+
postgres-version: '18'
6983

7084
steps:
7185
- name: Install Postgresql
@@ -91,7 +105,7 @@ jobs:
91105

92106
- name: Download Rails
93107
run: |
94-
git clone --branch v${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
108+
git clone --branch v${{ matrix.rails-version }} https://github.com/rails/rails.git ~/rails
95109
pushd ~/rails
96110
cat /home/runner/work/_temp/*.sh
97111
sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile
@@ -119,10 +133,15 @@ jobs:
119133
strategy:
120134
fail-fast: false
121135
matrix:
122-
rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
123-
ruby-version: ['3.4']
136+
rails-version:
137+
- 7.1.6
138+
- 7.2.3
139+
- 8.0.4
140+
- 8.1.1
141+
ruby-version:
142+
- 3.4
124143
exclude:
125-
- rails: '7.1.5.1'
144+
- rails-version: '7.1.6'
126145
ruby-version: '3.4'
127146

128147
steps:
@@ -135,7 +154,7 @@ jobs:
135154

136155
- name: Download Rails
137156
run: |
138-
git clone --branch v${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
157+
git clone --branch v${{ matrix.rails-version }} https://github.com/rails/rails.git ~/rails
139158
pushd ~/rails
140159
cat /home/runner/work/_temp/*.sh
141160
sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile
@@ -165,10 +184,15 @@ jobs:
165184
strategy:
166185
fail-fast: false
167186
matrix:
168-
rails: ['7.1.5.1', '7.2.2.1', '8.0.2']
169-
ruby-version: ['3.4']
187+
rails-version:
188+
- 7.1.6
189+
- 7.2.3
190+
- 8.0.4
191+
- 8.1.1
192+
ruby-version:
193+
- 3.4
170194
exclude:
171-
- rails: '7.1.5.1'
195+
- rails-version: '7.1.6'
172196
ruby-version: '3.4'
173197

174198
steps:
@@ -187,7 +211,7 @@ jobs:
187211

188212
- name: Download Rails
189213
run: |
190-
git clone --branch v${{ matrix.rails }} https://github.com/rails/rails.git ~/rails
214+
git clone --branch v${{ matrix.rails-version }} https://github.com/rails/rails.git ~/rails
191215
pushd ~/rails
192216
cat /home/runner/work/_temp/*.sh
193217
sed -i "s/Gem.ruby, '-w'/Gem.ruby, '-w0'/" ~/rails/activerecord/Rakefile

test/test_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
require 'byebug'
1010
require "minitest/autorun"
11-
require 'minitest/unit'
1211
require 'minitest/reporters'
1312
require 'active_record/filter'
1413
require 'faker'

0 commit comments

Comments
 (0)