Skip to content

Commit

Permalink
www/gitlab-ce: use sidekiq from ports
Browse files Browse the repository at this point in the history
The vendored sidekiq version does pollute the build environment, as
it does not respect the STAGEDIR.
As the vendored gem is maybe only a temporary solution:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/142986

till these changes are fixed upstream, I will switch back to
the sidekiq 7.1.6 version provided via ports.
  • Loading branch information
mfechner committed Feb 18, 2024
1 parent 8e2a489 commit 5a638f6
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
1 change: 1 addition & 0 deletions www/gitlab-ce/Makefile
Expand Up @@ -155,6 +155,7 @@ MY_DEPENDS= git>=2.41.0:devel/git \
rubygem-sd_notify>=0.1.1<0.2:devel/rubygem-sd_notify \
rubygem-state_machines-activerecord08>=0.8.0<0.9.0:databases/rubygem-state_machines-activerecord08 \
rubygem-acts-as-taggable-on>=10.0<11:www/rubygem-acts-as-taggable-on \
rubygem-sidekiq71>=7.1.6<7.2:devel/rubygem-sidekiq71 \
rubygem-sidekiq-cron-rails70>=1.12.0<1.13:devel/rubygem-sidekiq-cron-rails70 \
rubygem-fugit18>=1.8.1<1.9:devel/rubygem-fugit18 \
rubygem-httparty>=0.21.0<0.22:www/rubygem-httparty \
Expand Down
13 changes: 11 additions & 2 deletions www/gitlab-ce/files/patch-Gemfile
@@ -1,4 +1,4 @@
--- Gemfile.orig 2024-01-24 16:26:54 UTC
--- Gemfile.orig 2024-02-07 07:58:11 UTC
+++ Gemfile
@@ -58,7 +58,7 @@ gem 'neighbor', '~> 0.2.3' # rubocop:todo Gemfile/Miss

Expand Down Expand Up @@ -41,7 +41,16 @@
gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory

@@ -392,134 +392,15 @@ gem 'prometheus-client-mmap', '~> 1.1', require: 'prom
@@ -252,7 +252,7 @@ gem 'state_machines-activerecord', '~> 0.8.0' # ruboco
gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory

# Background jobs
-gem 'sidekiq', path: 'vendor/gems/sidekiq-7.1.6', require: 'sidekiq' # rubocop:todo Gemfile/MissingFeatureCategory
+gem 'sidekiq', '~> 7.1.6', require: 'sidekiq' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared
gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory

@@ -392,134 +392,15 @@ gem 'prometheus-client-mmap', '~> 1.1', '>= 1.1.1', re

gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory

Expand Down

0 comments on commit 5a638f6

Please sign in to comment.