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 sidekiq develop #426

Merged
merged 3 commits into from
Oct 1, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ rvm:

matrix:
fast_finish: true
allow_failures:
- gemfile: gemfiles/sidekiq_develop.gemfile
include:
- rvm: 2.5.6
gemfile: gemfiles/sidekiq_6.0.gemfile
Expand Down
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ gemspec

LOCAL_GEMS = "Gemfile.local"

gem "appraisal", ">= 2.2"
gem "appraisal", ">= 2.2"
gem "rspec-eventually", require: false
gem "rspec-its", require: false
gem "sidekiq", git: "https://github.com/mperham/sidekiq.git"

platforms :mri do
gem "benchmark-ips"
Expand Down
2 changes: 1 addition & 1 deletion lib/sidekiq_unique_jobs/version_check.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module SidekiqUniqueJobs
# @author Mikael Henriksson <mikael@zoolutions.se>
#
class VersionCheck
PATTERN = /(?<operator1>[<>=]+)?\s?(?<version1>(\d+.?)+)(\s+&&\s+)?(?<operator2>[<>=]+)?\s?(?<version2>(\d+.?)+)?/m.freeze # rubocop:disable LineLength
PATTERN = /(?<operator1>[<>=]+)?\s?(?<version1>(\d+.?)+)(\s+&&\s+)?(?<operator2>[<>=]+)?\s?(?<version2>(\d+.?)+)?/m.freeze # rubocop:disable Metrics/LineLength

#
# Checks if a version is consrtaint is satisfied
Expand Down
1 change: 1 addition & 0 deletions spec/sidekiq_unique_jobs/key_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
its(:changelog) { is_expected.to eq(SidekiqUniqueJobs::CHANGELOGS) }
its(:to_s) { is_expected.to eq(digest_one) }
its(:inspect) { is_expected.to eq(digest_one) }

its(:to_a) do
is_expected.to eq(
%W[
Expand Down