Skip to content

Commit 36de35d

Browse files
authored
chore(ci): update jruby setup (#2767)
* chore(ci): bump jruby 9.4.12.0 -> 9.4.14.0 * chore(ci): remove `jruby` from exclusion list in rails * fix(jruby): skip expectation under latest jruby too * chore(ci): add JRUBY_OPTS="--debug" to ENV
1 parent 20a2fcc commit 36de35d

File tree

9 files changed

+16
-7
lines changed

9 files changed

+16
-7
lines changed

.github/workflows/sentry_delayed_job_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
RUBYOPT: ${{ matrix.options.rubyopt }}
2929
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-delayed_job/Gemfile
3030
BUNDLE_WITHOUT: rubocop
31+
JRUBY_OPTS: "--debug" # for more accurate test coverage
3132
strategy:
3233
fail-fast: false
3334
matrix:

.github/workflows/sentry_opentelemetry_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-opentelemetry/Gemfile
3030
BUNDLE_WITHOUT: rubocop
3131
OPENTELEMETRY_VERSION: ${{ matrix.opentelemetry_version }}
32+
JRUBY_OPTS: "--debug" # for more accurate test coverage
3233
strategy:
3334
fail-fast: false
3435
matrix:

.github/workflows/sentry_rails_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-rails/Gemfile
2626
BUNDLE_WITHOUT: rubocop
2727
RAILS_VERSION: ${{ matrix.rails_version }}
28+
JRUBY_OPTS: "--debug" # for more accurate test coverage
2829
strategy:
2930
fail-fast: false
3031
matrix:
@@ -61,7 +62,6 @@ jobs:
6162
rails_version: 7.1.0
6263
exclude:
6364
- ruby_version: head
64-
- ruby_version: 'jruby'
6565
- ruby_version: jruby-head
6666
- ruby_version: "3.4"
6767
rails_version: "6.1.0"

.github/workflows/sentry_resque_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
RUBYOPT: ${{ matrix.options.rubyopt }}
2929
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-resque/Gemfile
3030
BUNDLE_WITHOUT: rubocop
31+
JRUBY_OPTS: "--debug" # for more accurate test coverage
3132
strategy:
3233
fail-fast: false
3334
matrix:

.github/workflows/sentry_ruby_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
BUNDLE_WITHOUT: rubocop
2727
RACK_VERSION: ${{ matrix.rack_version }}
2828
REDIS_RB_VERSION: ${{ matrix.redis_rb_version }}
29+
JRUBY_OPTS: "--debug" # for more accurate test coverage
2930
strategy:
3031
fail-fast: false
3132
matrix:

.github/workflows/sentry_sidekiq_test.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,18 @@ jobs:
2929
BUNDLE_GEMFILE: ${{ github.workspace }}/sentry-sidekiq/Gemfile
3030
BUNDLE_WITHOUT: rubocop
3131
SIDEKIQ_VERSION: ${{ matrix.sidekiq_version }}
32+
JRUBY_OPTS: "--debug" # for more accurate test coverage
3233
strategy:
3334
fail-fast: false
3435
matrix:
3536
ruby_version: ${{ fromJson(inputs.versions) }}
3637
sidekiq_version: ["5.0", "6.5", "7.0"]
3738
include:
38-
- ruby_version: jruby-9.4.12.0
39+
- ruby_version: jruby-9.4.14.0
3940
sidekiq_version: 5.0
40-
- ruby_version: jruby-9.4.12.0
41+
- ruby_version: jruby-9.4.14.0
4142
sidekiq_version: 6.0
42-
- ruby_version: jruby-9.4.12.0
43+
- ruby_version: jruby-9.4.14.0
4344
sidekiq_version: 7.0
4445
- ruby_version: "3.2"
4546
sidekiq_version: 7.0

.github/workflows/tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
with:
1919
engine: cruby-jruby
2020
min_version: 2.7
21-
versions: '["jruby-9.4.12.0"]'
21+
versions: '["jruby-9.4.14.0"]'
2222
secrets: inherit
2323

2424
delayed_job-tests:

sentry-rails/spec/sentry/rails/activejob_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ def perform
352352

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

sentry-rails/spec/sentry/rails/tracing/active_record_subscriber_spec.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,11 @@ def foo
9595
data = span[:data]
9696
expect(data["code.filepath"]).to eq(__FILE__)
9797
expect(data["code.lineno"]).to eq(query_line)
98-
expect(data["code.namespace"]).to eq(rspec_class) if RUBY_VERSION.to_f >= 3.4
98+
99+
if RUBY_VERSION.to_f >= 3.4 && RUBY_ENGINE == "ruby"
100+
expect(data["code.namespace"]).to eq(rspec_class)
101+
end
102+
99103
expect(data["code.function"]).to eq("foo")
100104
end
101105
end

0 commit comments

Comments
 (0)