Skip to content

Commit

Permalink
www/gitlab-ce: Allow run with rubygem-sidekiq6 6.5.11
Browse files Browse the repository at this point in the history
- Bump PORTREVISION for package change

Note that it is an upstream issue.
Upstream has conflicting requirement for sidekiq which causes runtime issue.

from Gemfile:
gem 'sidekiq', '~> 6.5.7'

from lib/gitlab/patch/sidekiq_cron_poller.rb:
if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.7')
  raise 'New version of sidekiq detected, please remove or update this patch'
end
  • Loading branch information
sunpoet committed Oct 8, 2023
1 parent b159e5d commit aff9c1b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion www/gitlab-ce/Makefile
@@ -1,6 +1,6 @@
PORTNAME= gitlab-ce
PORTVERSION= 16.4.1
PORTREVISION= 1
PORTREVISION= 2
DISTVERSIONPREFIX= v
CATEGORIES= www devel

Expand Down
Expand Up @@ -5,7 +5,7 @@
require 'sidekiq/cron/version'

-if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.7')
+if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.10')
+if Gem::Version.new(Sidekiq::VERSION) != Gem::Version.new('6.5.11')
raise 'New version of sidekiq detected, please remove or update this patch'
end

0 comments on commit aff9c1b

Please sign in to comment.