Fix broken dependencies #352
Closed
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
gavindidrichsen
added
the
maintenance
gavindidrichsen
force-pushed
the
cat_1910_fix_nightlies
branch
2 times, most recently
from
c75b525 to
1d817e8
Compare
Without this, a warning appears that multiple new cops are not being checked. Adding `NewCops: enable` meant 100's of new rubocop warnings appeared. I fixed some and moved many to the `.rubocop_todo.yml`. Signed-off-by: Gavin Didrichsen <[email protected]>
Initially, I tried to correct all the new warnings but as the list of corrections was 100+, the CI broke, and the focus of this PR was restoring resource_api to green on CI, I pushed most of the corrections to this to-do list to fix at a later stage. Signed-off-by: Gavin Didrichsen <[email protected]>
The reasons for the above are explained in the ADR document `doc/adr/0002-split-gemfile-dependencies-by-jruby-and-ruby-engines.md` Signed-off-by: Gavin Didrichsen <[email protected]>
All of these warnings were fixed in order to correct a rubocop syntax error occuring in jruby but not ruby. After pinning jruby's (9.3 and 9.4) to an older version of rubocop than ruby's versions (2.7 and 3.2), the older rubocop did not recognize some newer cops listed in the `rubocop_todo.yml`. The solution was to auto-correct just these new exceptions. This is a temporary solution, however, as newer cop warnings may cause the same issue again. Signed-off-by: Gavin Didrichsen <[email protected]>
gavindidrichsen
force-pushed
the
cat_1910_fix_nightlies
branch
2 times, most recently
from
14f0e76 to
35bbfa5
Compare
gavindidrichsen
force-pushed
the
cat_1910_fix_nightlies
branch
2 times, most recently
from
768abd1 to
f7fe2e5
Compare
david22swan
approved these changes
Jun 17, 2024
| - 'spec/puppet/resource_api/transport_schema_def_spec.rb' | ||
|
|
||
| # Offense count: 1 | ||
| # This cop supports safe autocorrection (--autocorrect). |
There was a problem hiding this comment.
Might be good to try and do the safe autocorrects
There was a problem hiding this comment.
Hi @david22swan. I thought about getting this across the line with a green CI and then doing further autocorrects in another PR. The autocorrects I included in this PR were necessary to keep CI green for the jruby environment tests.
gavindidrichsen
force-pushed
the
cat_1910_fix_nightlies
branch
from
26aed3c to
88d87ce
Compare
Signed-off-by: Gavin Didrichsen <[email protected]>
gavindidrichsen
force-pushed
the
cat_1910_fix_nightlies
branch
from
8d8f120 to
622a339
Compare
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.
Summary
Recent rubocop updates broke the resource_api's CI:
Although the fix for
rubyenvironments was to change the Gemfile from this:to this:
The same could not be applied to the resource_api's
jrubyenvironments. This PR adds a workaround to keep both therubyandjrubyenvironments passing in CI.NOTE: I also moved some of the commentary about rubocop from the
Gemfileand into separate design decision documents. See below for more information.For more information
For more information about why the above changes were made, see
Checklist