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.

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

Fix the build #2463

Merged
merged 3 commits into from
Nov 14, 2024
+12 −6
Merged

Fix the build #2463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61399f5
[delayed_job] pin activerecord-jdbcmysql-adapter to a specific sha fo…
solnic Nov 14, 2024
7f5e7a5
[delayed_job] update sqlite for older rubies
solnic Nov 14, 2024
580f3df
[sidekiq] fix specs
solnic Nov 14, 2024
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
14 changes: 10 additions & 4 deletions sentry-delayed_job/Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,20 @@ gem "rails", "> 5.0.0"

platform :jruby do
# See https://github.com/jruby/activerecord-jdbc-adapter/issues/1139
gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter"
gem "activerecord-jdbcmysql-adapter", github: "jruby/activerecord-jdbc-adapter", ref: "6b3983bbbfda75ee2a1f5bc4c8d35efd7b71d84b"
gem "jdbc-sqlite3"
end

if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5.0")
ruby_version = Gem::Version.new(RUBY_VERSION)

if ruby_version < Gem::Version.new("2.5.0")
gem "sqlite3", "~> 1.3.0", platform: :ruby
else
gem "sqlite3", "~> 1.6.9", platform: :ruby
elsif ruby_version < Gem::Version.new("3.0.0")
gem "sqlite3", "~> 1.6.0", platform: :ruby
elsif ruby_version >= Gem::Version.new("3.0.0") && ruby_version < Gem::Version.new("3.1.0")
gem "sqlite3", "~> 1.7.0", platform: :ruby
elsif ruby_version >= Gem::Version.new("3.1.0")
gem "sqlite3", "~> 2.2", platform: :ruby
end

eval_gemfile File.expand_path("../Gemfile", __dir__)
2 changes: 1 addition & 1 deletion sentry-ruby/spec/sentry/client/event_sending_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@

client.capture_event(event, scope)

expect(string_io.string).to include("Converting event (#{event.event_id}) to JSON compatible hash failed: source sequence is illegal/malformed utf-8")
expect(string_io.string).to match(/Converting event \(#{event.event_id}\) to JSON compatible hash failed:.*illegal\/malformed utf-8/i)
end
end

Expand Down
2 changes: 1 addition & 1 deletion sentry-sidekiq/spec/sentry/sidekiq/cron/job_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
end

before do
stub_const('Job', Class.new { def perform; end })
stub_const('Job', Class.new { include Sidekiq::Worker; def perform; end })
end

it 'patches class' do
Expand Down
Loading