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.

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

Fix CI [changelog skip] #2561

Merged
merged 1 commit into from Mar 2, 2021
Merged

Fix CI [changelog skip] #2561

merged 1 commit into from Mar 2, 2021

Conversation

MSP-Greg
Copy link
Member

@MSP-Greg MSP-Greg commented Mar 1, 2021

Description

Fix CI

  1. Add racc to Gemfile for JRuby RuboCop
  2. test_busy_worker - skip teardown
  3. test_integration_single - patch from PR 2560

Please describe your pull request. Thank you for contributing! You're the best.

Your checklist for this pull request

  • I have reviewed the guidelines for contributing to this repository.
  • I have added an entry to History.md if this PR fixes a bug or adds a feature. If it doesn't need an entry to HISTORY.md, I have added [changelog skip] or [ci skip] to the pull request title.
  • I have added (or updated) appropriate tests if this PR fixes a bug or adds a feature.
  • My pull request is 100 lines added/removed or less so that it can be easily reviewed.
  • If this PR doesn't need tests (docs change), I added [ci skip] to the title of the PR.
  • If this closes any issues, I have added "Closes #issue" to the PR description or my commit messages.
  • I have updated the documentation accordingly.
  • All new and existing tests passed, including Rubocop.

1. Add racc to Gemfile for JRuby RuboCop
2. test_busy_worker - skip teardown
3. test_integration_single - patch from PR 2560
@@ -15,6 +15,8 @@ gem "minitest-stub-const"
gem "sd_notify"

gem "jruby-openssl", :platform => "jruby"
# needed for rubocop
gem "racc", :platform => "jruby"
Copy link
Member

@dentarg dentarg Mar 1, 2021

Choose a reason for hiding this comment

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

Is this a bug in rubocop that we need to add it? (Or bundler or JRuby)

Copy link
Member Author

Choose a reason for hiding this comment

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

Probably JRuby, but it's recent, and will probably be fixed in the future? Log from Actions:

Run bundle exec rake rubocop
rake aborted!
LoadError: no such file to load -- racc/info
/home/runner/.rubies/jruby-9.2.15.0/bin/bundle:23:in `<main>'

@nateberkopec nateberkopec merged commit a192434 into puma:master Mar 2, 2021
@MSP-Greg MSP-Greg deleted the 00-ci branch March 2, 2021 16:29
@olleolleolle
Copy link
Contributor

Now the JRuby release should include racc on its own again, can this work without the intervention?

@MSP-Greg
Copy link
Member Author

MSP-Greg commented Mar 4, 2021

@olleolleolle

Thanks. I just checked in my fork.

We bypass RuboCop on JRuby head, probably due to time. I just downloaded the latest Windows release, and the file is included.

But, jruby-9.2.15.0 doesn't have racc installed or the file is still missing. See:

https://github.com/MSP-Greg/puma/actions/runs/621117884

Does that seem correct?

@olleolleolle
Copy link
Contributor

olleolleolle commented Mar 4, 2021

https://www.jruby.org/2021/03/03/jruby-9-2-16-0.html I was thinking of this release, which seeeeems to mention racc in its notes? yes, as a fix to the problem w/ 9.2.15.0 which would lack the racc.

@MSP-Greg
Copy link
Member Author

MSP-Greg commented Mar 4, 2021

Everyone can keep an eye on it, but 9.2.16.0 isn't available yet from ruby/setup-ruby.

See ruby/setup-ruby#156

@MSP-Greg
Copy link
Member Author

MSP-Greg commented Mar 4, 2021

@olleolleolle

Sorry, I should have 'followed' the bug.

I was working on other things and also irritated because 'Ruby packagers' should never remove default gems. There's enough issues with bundled gems (and default gems being converted to bundled gems)...

@MSP-Greg
Copy link
Member Author

MSP-Greg commented Mar 4, 2021

Fixed in ca43480

Thanks to @eregon for the quick updates to both ruby/ruby-builder and ruby/setup-ruby.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants