Fixes #35463 - Allow newer rdoc on Ruby 3.1 #10140
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Ruby 3.1 ships rdoc 6.1 by default.
Closed
|
Why did Katello run for almost 6 hours? @evgeni should we add a stricter time limit? |
|
That's probably a good idea. No test should run more than an hour? |
evgeni
reviewed
May 2, 2024
| @@ -14,7 +14,7 @@ gem 'apipie-rails', '>= 0.8.0', '< 2' | |||
| gem 'apipie-dsl', '>= 2.6.2' | |||
| # Pin rdoc to prevent updating bundled psych (https://github.com/ruby/rdoc/commit/ebe185c8775b2afe844eb3da6fa78adaa79e29a4) | |||
| # Rails 6.0 is incompatible with Psych 4, Rails 6.1 should work | |||
| gem 'rdoc', '< 6.4' | |||
| gem 'rdoc', RUBY_VERSION < '3.1' ? '< 6.4' : nil | |||
There was a problem hiding this comment.
Given the comment above, shouldn't we just drop that rdoc pin?
There was a problem hiding this comment.
Ah, nvm, we need rdoc in the Gemfile, just with no pins.
evgeni
approved these changes
May 2, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ruby 3.1 ships rdoc 6.1 by default.