Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix 3-9-maintenance CI failures #2360

Merged
merged 21 commits into from Jul 28, 2020
Merged

Fix 3-9-maintenance CI failures #2360

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
02858cb
Bump Rubies
pirj Jun 29, 2020
4fcdae4
Skip bootsnap like a no-AR app generator does
pirj Jun 29, 2020
c4ff60b
Fix gem source mistake
pirj Jul 19, 2020
c7b8a6c
Provide historical info to avoid confusion
pirj Jul 19, 2020
6162f89
Make sure we use compatible i18n for old Rubies
pirj Jul 19, 2020
8075525
Update rubygems to a newer version
pirj Jul 19, 2020
088bce9
Cap dependencies for 2.2.10
pirj Jul 19, 2020
a53facb
Add error handling to bundler downgrade
pirj Jul 19, 2020
a7dd9d6
Fix sprockets dependency
pirj Jul 19, 2020
a87877e
Drop invalid cop
pirj Jul 19, 2020
2b1e7fe
Fix undefined method `to_h` for ENV
pirj Jul 19, 2020
102ba31
Mute RuboCop offence
pirj Jul 19, 2020
f5ebf79
Remove cops unknown to CI RuboCop version
pirj Jul 19, 2020
bed4459
Fix install-time gem version incompatibilities
pirj Jul 20, 2020
89dd9ec
Backport skipping of a spec due to Rails bug
pirj Jul 20, 2020
6a8fd07
Test a stable version of Rails 5.2 with Ruby 2.2
pirj Jul 20, 2020
0a3703e
Avoid spring to be bundled
pirj Jul 20, 2020
6e6a144
Cap Aruba and ffi to resolve version conflicts
pirj Jul 20, 2020
5781ea1
Use the previous aruba for older Rails
pirj Jul 21, 2020
a8dd5e1
Add 5-2-stable Ruby 2.2 build to allowed failures
pirj Jul 22, 2020
1dcff41
Clarify why a specific version of Aruba is used
pirj Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
183 changes: 0 additions & 183 deletions .rubocop_rspec_base.yml
View file
Open in desktop
Expand Up @@ -69,10 +69,6 @@ LineLength:
MethodLength:
Max: 15

# Who cares what we call the argument for binary operator methods?
Copy link
Member

Choose a reason for hiding this comment

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

Are these just in line with 4-0?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, those rules have diverged in #2272, and we got rid of .rubocop_rspec_base.yml altogether when separated rspec-rails from the rest of RSpec.

BinaryOperatorParameterName:
Enabled: false

PercentLiteralDelimiters:
PreferredDelimiters:
'%': () # double-quoted string
Expand Down Expand Up @@ -115,195 +111,16 @@ StringLiterals:
Style/SpecialGlobalVars:
Enabled: false

Style/TrailingCommaInLiteral:
Enabled: false

Style/TrailingCommaInArguments:
Enabled: false

TrivialAccessors:
AllowDSLWriters: true
AllowPredicates: true
ExactNameMatch: true

Style/ParallelAssignment:
Enabled: false

Layout/EmptyLineBetweenDefs:
Enabled: false

Layout/FirstParameterIndentation:
Enabled: false

Naming/ConstantName:
Enabled: false

Style/ClassCheck:
Enabled: false

Style/ConditionalAssignment:
Enabled: false

Style/EmptyMethod:
Enabled: false

Style/FormatStringToken:
Enabled: false

Style/GuardClause:
Enabled: false

Style/IdenticalConditionalBranches:
Enabled: false

Style/IfUnlessModifier:
Enabled: false

Style/IfUnlessModifierOfIfUnless:
Enabled: false

Style/MethodMissing:
Enabled: false

Style/MixinUsage:
Enabled: false

Style/MultipleComparison:
Enabled: false

Style/MutableConstant:
Enabled: false

Style/NestedModifier:
Enabled: false

Style/NestedParenthesizedCalls:
Enabled: false

Style/NumericPredicate:
Enabled: false

Style/RedundantParentheses:
Enabled: false

Style/StringLiteralsInInterpolation:
Enabled: false

Style/SymbolArray:
Enabled: false

Style/SymbolProc:
Enabled: false

Style/YodaCondition:
Enabled: false

Style/ZeroLengthPredicate:
Enabled: false

Layout/ClosingParenthesisIndentation:
Enabled: false

Layout/ExtraSpacing:
Enabled: false

Layout/MultilineMethodCallBraceLayout:
Enabled: false

Layout/MultilineMethodCallIndentation:
Enabled: false

Layout/MultilineOperationIndentation:
Enabled: false

Layout/SpaceAroundBlockParameters:
Enabled: false

Layout/SpaceAroundOperators:
Enabled: false

Layout/SpaceBeforeComma:
Enabled: false

Style/BlockDelimiters:
Enabled: false

Style/EmptyCaseCondition:
Enabled: false

Style/MultilineIfModifier:
Enabled: false

Style/RescueStandardError:
Enabled: false

Style/StderrPuts:
Enabled: false

Style/TernaryParentheses:
Enabled: false

# This could likely be enabled, but it had a false positive on rspec-mocks
# (suggested change was not behaviour preserving) so I don't trust it.
Performance/HashEachMethods:
Enabled: false

Naming/HeredocDelimiterNaming:
Enabled: false

Layout/EmptyLineAfterMagicComment:
Enabled: false

Layout/IndentArray:
Enabled: false

Layout/IndentAssignment:
Enabled: false

Layout/IndentHeredoc:
Enabled: false

Layout/SpaceInsidePercentLiteralDelimiters:
Enabled: false

Style/EmptyElse:
Enabled: false

Style/IfInsideElse:
Enabled: false

Style/RedundantReturn:
Enabled: false

Style/StructInheritance:
Enabled: false

Naming/VariableNumber:
Enabled: false

Layout/SpaceInsideStringInterpolation:
Enabled: false

Style/DateTime:
Enabled: false

Style/ParenthesesAroundCondition:
Enabled: false

Layout/EmptyLinesAroundBlockBody:
Enabled: false

Lint/ImplicitStringConcatenation:
Enabled: false

Lint/NestedMethodDefinition:
Enabled: false

Style/RegexpLiteral:
Enabled: false

Style/TrailingUnderscoreVariable:
Enabled: false

Layout/EmptyLinesAroundAccessModifier:
Enabled: false
67 changes: 38 additions & 29 deletions .travis.yml
View file
Open in desktop
Expand Up @@ -38,57 +38,61 @@ dist: trusty
matrix:
include:
# Rails dev / 6 builds >= 2.4.4
- rvm: 2.6.3
- rvm: 2.6.6
pirj marked this conversation as resolved.
Show resolved Hide resolved
env: RAILS_VERSION=master
- rvm: 2.5.3
- rvm: 2.5.8
env: RAILS_VERSION=master
- rvm: 2.4.4
- rvm: 2.4.10
env: RAILS_VERSION=master

# Rails 5.2 builds >= 2.2.2
- rvm: 2.6.3
- rvm: 2.6.6
env: RAILS_VERSION='~> 5.2.0'
- rvm: 2.5.3
- rvm: 2.5.8
env: RAILS_VERSION='~> 5.2.0'
- rvm: 2.4.4
- rvm: 2.4.10
env: RAILS_VERSION='~> 5.2.0'
- rvm: 2.3.7
- rvm: 2.3.8
env: RAILS_VERSION='~> 5.2.0'
- rvm: 2.2.10
env: RAILS_VERSION='~> 5.2.0'
# An incompatibility with Ruby 2.2 in Rails 5.2.4.0 (still not fixed 5.2.4.3)
# prevents from testing against this combination. This bug is not in 5-2-stable:
# lib/action_dispatch/request/session.rb:96: syntax error, unexpected '.'
# id&.public_id
env: RAILS_VERSION='5-2-stable'
Copy link
Member

Choose a reason for hiding this comment

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

On master we test both, and allow failure direct in the matrix.

Copy link
Member Author

Choose a reason for hiding this comment

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

Do you suggest adding a job for ~> 5.2.0 here and allow its failure?


# Rails 5.1 Builds >= 2.2.2
- rvm: 2.6.3
- rvm: 2.6.6
env: RAILS_VERSION='~> 5.1.0'
- rvm: 2.5.3
- rvm: 2.5.8
env: RAILS_VERSION='~> 5.1.0'
- rvm: 2.4.4
- rvm: 2.4.10
env: RAILS_VERSION='~> 5.1.0'
- rvm: 2.3.7
- rvm: 2.3.8
env: RAILS_VERSION='~> 5.1.0'
- rvm: 2.2.10
env: RAILS_VERSION='~> 5.1.0'

# Rails 5.0 Builds >= 2.2.2
- rvm: 2.6.3
- rvm: 2.6.6
env: RAILS_VERSION='~> 5.0.0'
- rvm: 2.5.3
- rvm: 2.5.8
env: RAILS_VERSION='~> 5.0.0'
- rvm: 2.4.4
- rvm: 2.4.10
env: RAILS_VERSION='~> 5.0.0'
- rvm: 2.3.7
- rvm: 2.3.8
env: RAILS_VERSION='~> 5.0.0'
- rvm: 2.2.10
env: RAILS_VERSION='~> 5.0.0'

# Rails 4.2 Builds >= 1.9.3
- rvm: 2.4.4
- rvm: 2.4.10
env: RAILS_VERSION='~> 4.2.0'
- rvm: 2.4.4
- rvm: 2.4.10
env: RAILS_VERSION=4-2-stable
- rvm: 2.3.7
- rvm: 2.3.8
env: RAILS_VERSION='~> 4.2.0'
- rvm: 2.3.7
- rvm: 2.3.8
env: RAILS_VERSION=4-2-stable
- rvm: 2.2.10
env: RAILS_VERSION='~> 4.2.0'
Expand All @@ -108,9 +112,9 @@ matrix:
env: RAILS_VERSION=4-2-stable

# Rails 4.1 Builds >= 1.9.3, < 2.4
- rvm: 2.3.7
- rvm: 2.3.8
env: RAILS_VERSION='~> 4.1.0'
- rvm: 2.3.7
- rvm: 2.3.8
env: RAILS_VERSION=4-1-stable
- rvm: 2.2.10
env: RAILS_VERSION='~> 4.1.0'
Expand All @@ -130,9 +134,9 @@ matrix:
env: RAILS_VERSION=4-1-stable

# Rails 4.0 Builds >= 1.8.11, < 2.4
- rvm: 2.3.7
- rvm: 2.3.8
env: RAILS_VERSION='~> 4.0.4'
- rvm: 2.3.7
- rvm: 2.3.8
env: RAILS_VERSION=4-0-stable
- rvm: 2.2.10
env: RAILS_VERSION='~> 4.0.4'
Expand All @@ -152,9 +156,9 @@ matrix:
env: RAILS_VERSION=4-0-stable

# Rails 3.2 Builds < 2.4
- rvm: 2.3.7
- rvm: 2.3.8
env: RAILS_VERSION='~> 3.2.17'
- rvm: 2.3.7
- rvm: 2.3.8
env: RAILS_VERSION=3-2-stable
- rvm: 2.2.10
env: RAILS_VERSION='~> 3.2.17'
Expand Down Expand Up @@ -202,12 +206,17 @@ matrix:
env: RAILS_VERSION='~> 3.0.20'

allow_failures:
- rvm: 2.6.3
- rvm: 2.6.6
env: RAILS_VERSION=master
- rvm: 2.5.3
- rvm: 2.5.8
env: RAILS_VERSION=master
- rvm: 2.4.4
- rvm: 2.4.10
env: RAILS_VERSION=master
- rvm: 2.2.10
# An actual incompatibility of 5.2.4.0-5.2.4.3 forces to use `5-2-stable`,
# but there's a minor difference in the generated tests that results in a
# minor failure.
env: RAILS_VERSION='5-2-stable'
fast_finish: true

branches:
Expand Down
14 changes: 8 additions & 6 deletions Gemfile
View file
Open in desktop
Expand Up @@ -11,9 +11,9 @@ gem 'yard', '~> 0.9.24', :require => false

### deps for rdoc.info
group :documentation do
gem 'redcarpet'
gem 'github-markup'
if RUBY_VERSION > '2.0.0'
gem 'redcarpet'
gem 'github-markup'
gem 'relish'
end
end
Expand All @@ -30,8 +30,10 @@ end

if RUBY_VERSION < '1.9'
gem 'ffi', '< 1.9.19' # ffi dropped Ruby 1.8 support in 1.9.19
else
gem 'ffi', '~> 1.9.25'
elsif RUBY_VERSION < '2.0'
gem 'ffi', '< 1.11.0' # ffi dropped Ruby 2.0 support in 1.11.0
elsif RUBY_VERSION < '2.3'
gem 'ffi', '< 1.13.0'
end

if RUBY_VERSION >= '2.0.0'
Expand Down Expand Up @@ -80,8 +82,8 @@ if RUBY_VERSION <= '1.8.7'
# cucumber and gherkin require rubyzip as a runtime dependency on 1.8.7
# Only < 1.0 supports 1.8.7
gem 'rubyzip', '< 1.0'
else
gem "rubyzip", '>= 1.2.2'
elsif RUBY_VERSION < '2.4'
pirj marked this conversation as resolved.
Show resolved Hide resolved
gem 'rubyzip', '>= 1.2.2', '< 2.0.0'
end

if RUBY_VERSION >= '2.0.0' && RUBY_VERSION < '2.2.0'
Expand Down