Skip to content

Commit 04c580e

Browse files
authored
Remove rails_main from CI workflow, and pry dependency (#497)
These make CI fail and aren't particularly useful.
1 parent 3d32141 commit 04c580e

File tree

7 files changed

+9
-99
lines changed

7 files changed

+9
-99
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@
22
name: CI
33

44
on:
5-
pull_request:
6-
branches:
7-
- '*'
85
push:
96
branches:
10-
- master
7+
- main
8+
pull_request:
9+
1110
jobs:
1211
# SQLITE
1312
sqlite:
@@ -24,7 +23,6 @@ jobs:
2423
- rails_7_1
2524
- rails_7_2
2625
- rails_8_0
27-
- rails_main
2826
exclude:
2927
- ruby: 'head'
3028
gemfile: rails_6_1
@@ -56,19 +54,6 @@ jobs:
5654
- ruby: '3.0'
5755
gemfile: rails_5_2
5856

59-
# Rails 8.1 requires Ruby 3.2 or higher
60-
- ruby: '2.6'
61-
gemfile: rails_main
62-
63-
- ruby: '2.7'
64-
gemfile: rails_main
65-
66-
- ruby: '3.0'
67-
gemfile: rails_main
68-
69-
- ruby: '3.1'
70-
gemfile: rails_main
71-
7257
- ruby: '2.6'
7358
gemfile: rails_7_0
7459

@@ -115,7 +100,7 @@ jobs:
115100
bundle exec rspec spec
116101
117102
118-
# MYSQL
103+
# MySQL
119104
mysql:
120105
runs-on: ubuntu-latest
121106
strategy:
@@ -130,7 +115,6 @@ jobs:
130115
- rails_7_1
131116
- rails_7_2
132117
- rails_8_0
133-
- rails_main
134118
exclude:
135119
- ruby: 'head'
136120
gemfile: rails_6_1
@@ -162,19 +146,6 @@ jobs:
162146
- ruby: '3.0'
163147
gemfile: rails_5_2
164148

165-
# Rails 8.1 requires Ruby 3.2 or higher
166-
- ruby: '2.6'
167-
gemfile: rails_main
168-
169-
- ruby: '2.7'
170-
gemfile: rails_main
171-
172-
- ruby: '3.0'
173-
gemfile: rails_main
174-
175-
- ruby: '3.1'
176-
gemfile: rails_main
177-
178149
- ruby: '2.6'
179150
gemfile: rails_7_0
180151

@@ -183,7 +154,7 @@ jobs:
183154

184155
- ruby: '2.6'
185156
gemfile: rails_7_2
186-
157+
187158
- ruby: '2.7'
188159
gemfile: rails_7_2
189160

@@ -236,7 +207,7 @@ jobs:
236207
bundle exec rspec spec
237208
238209
239-
# POSTGRES
210+
# Postgres
240211
postgres:
241212
runs-on: ubuntu-latest
242213
strategy:
@@ -251,7 +222,6 @@ jobs:
251222
- rails_7_1
252223
- rails_7_2
253224
- rails_8_0
254-
- rails_main
255225
exclude:
256226
- ruby: 'head'
257227
gemfile: rails_6_1
@@ -283,19 +253,6 @@ jobs:
283253
- ruby: '3.0'
284254
gemfile: rails_5_2
285255

286-
# Rails 8.1 requires Ruby 3.2 or higher
287-
- ruby: '2.6'
288-
gemfile: rails_main
289-
290-
- ruby: '2.7'
291-
gemfile: rails_main
292-
293-
- ruby: '3.0'
294-
gemfile: rails_main
295-
296-
- ruby: '3.1'
297-
gemfile: rails_main
298-
299256
- ruby: '2.6'
300257
gemfile: rails_7_0
301258

@@ -328,7 +285,7 @@ jobs:
328285

329286
services:
330287
postgres:
331-
image: postgres:12
288+
image: postgres:18
332289
env:
333290
POSTGRES_USER: postgres
334291
POSTGRES_PASSWORD: postgres

Appraisals

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"7_0" => "7.0.0",
66
"7_1" => "7.1.0",
77
"7_2" => "7.2.0",
8-
"8_0" => "8.0.0.rc1"
8+
"8_0" => "8.0.0"
99
}.each do |rails, version|
1010
appraise "rails-#{rails}" do
1111
gem "rails", "~> #{version}"
@@ -17,7 +17,3 @@
1717
end
1818
end
1919
end
20-
21-
appraise "rails-main" do
22-
gem "rails", github: "rails/rails", branch: "main"
23-
end

awesome_nested_set.gemspec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Gem::Specification.new do |s|
2222

2323
s.add_development_dependency 'appraisal'
2424
s.add_development_dependency 'database_cleaner'
25-
s.add_development_dependency 'pry'
26-
s.add_development_dependency 'pry-nav'
2725
s.add_development_dependency 'rake', '~> 13'
2826
s.add_development_dependency 'rspec-rails', '>= 4.0.0', '< 8.0'
2927
end

certs/parndt.pem

Lines changed: 0 additions & 27 deletions
This file was deleted.

gemfiles/rails_8_0.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source "https://rubygems.org"
44

5-
gem "rails", "~> 8.0.0.rc1"
5+
gem "rails", "~> 8.0.0"
66

77
platforms :ruby do
88
gem "sqlite3"

gemfiles/rails_main.gemfile

Lines changed: 0 additions & 13 deletions
This file was deleted.

spec/spec_helper.rb

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

33
require 'rubygems'
44
require 'bundler/setup'
5-
require 'pry'
65

76
require 'logger'
87
require 'active_record'

0 commit comments

Comments
 (0)