Skip to content

chore(ci): update jruby setup #2767

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

Merged
solnic merged 4 commits into from
Nov 4, 2025
Merged

chore(ci): update jruby setup #2767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6714b79
chore(ci): bump jruby 9.4.12.0 -> 9.4.14.0
solnic Nov 4, 2025
a1a6bb9
chore(ci): remove `jruby` from exclusion list in rails
solnic Nov 4, 2025
cd4a018
fix(jruby): skip expectation under latest jruby too
solnic Nov 4, 2025
65fe1af
chore(ci): add JRUBY_OPTS="--debug" to ENV
solnic Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/sentry_delayed_job_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
RUBYOPT: ${{ matrix.options.rubyopt }}
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-delayed_job/Gemfile
BUNDLE_WITHOUT: rubocop
JRUBY_OPTS: "--debug" # for more accurate test coverage
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sentry_opentelemetry_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-opentelemetry/Gemfile
BUNDLE_WITHOUT: rubocop
OPENTELEMETRY_VERSION: ${{ matrix.opentelemetry_version }}
JRUBY_OPTS: "--debug" # for more accurate test coverage
strategy:
fail-fast: false
matrix:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sentry_rails_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-rails/Gemfile
BUNDLE_WITHOUT: rubocop
RAILS_VERSION: ${{ matrix.rails_version }}
JRUBY_OPTS: "--debug" # for more accurate test coverage
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -61,7 +62,6 @@ jobs:
rails_version: 7.1.0
exclude:
- ruby_version: head
- ruby_version: 'jruby'
- ruby_version: jruby-head
- ruby_version: "3.4"
rails_version: "6.1.0"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sentry_resque_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
RUBYOPT: ${{ matrix.options.rubyopt }}
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-resque/Gemfile
BUNDLE_WITHOUT: rubocop
JRUBY_OPTS: "--debug" # for more accurate test coverage
strategy:
fail-fast: false
matrix:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/sentry_ruby_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
BUNDLE_WITHOUT: rubocop
RACK_VERSION: ${{ matrix.rack_version }}
REDIS_RB_VERSION: ${{ matrix.redis_rb_version }}
JRUBY_OPTS: "--debug" # for more accurate test coverage
strategy:
fail-fast: false
matrix:
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/sentry_sidekiq_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,18 @@ jobs:
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-sidekiq/Gemfile
BUNDLE_WITHOUT: rubocop
SIDEKIQ_VERSION: ${{ matrix.sidekiq_version }}
JRUBY_OPTS: "--debug" # for more accurate test coverage
strategy:
fail-fast: false
matrix:
ruby_version: ${{ fromJson(inputs.versions) }}
sidekiq_version: ["5.0", "6.5", "7.0"]
include:
- ruby_version: jruby-9.4.12.0
- ruby_version: jruby-9.4.14.0
sidekiq_version: 5.0
- ruby_version: jruby-9.4.12.0
- ruby_version: jruby-9.4.14.0
sidekiq_version: 6.0
- ruby_version: jruby-9.4.12.0
- ruby_version: jruby-9.4.14.0
sidekiq_version: 7.0
- ruby_version: "3.2"
sidekiq_version: 7.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
with:
engine: cruby-jruby
min_version: 2.7
versions: '["jruby-9.4.12.0"]'
versions: '["jruby-9.4.14.0"]'
secrets: inherit

delayed_job-tests:
Expand Down
2 changes: 1 addition & 1 deletion sentry-rails/spec/sentry/rails/activejob_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ def perform

describe "Reporting on retry errors", skip: RAILS_VERSION < 7.0 do
before do
if defined?(JRUBY_VERSION) && JRUBY_VERSION == "9.4.12.0"
if defined?(JRUBY_VERSION) && JRUBY_VERSION == "9.4.14.0"
skip "This crashes on jruby + rails 7.0.0.x. See https://github.com/getsentry/sentry-ruby/issues/2612"
end

Expand Down
6 changes: 5 additions & 1 deletion sentry-rails/spec/sentry/rails/tracing/active_record_subscriber_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,11 @@ def foo
data = span[:data]
expect(data["code.filepath"]).to eq(__FILE__)
expect(data["code.lineno"]).to eq(query_line)
expect(data["code.namespace"]).to eq(rspec_class) if RUBY_VERSION.to_f >= 3.4

if RUBY_VERSION.to_f >= 3.4 && RUBY_ENGINE == "ruby"
expect(data["code.namespace"]).to eq(rspec_class)
end

expect(data["code.function"]).to eq("foo")
end
end
Expand Down
Loading