From nobody Sun Feb 18 05:16:25 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Tcv616HSJz5BW48; Sun, 18 Feb 2024 05:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tcv612HcWz4Z8l; Sun, 18 Feb 2024 05:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708233385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RA80Vq9JRQs9JqflgZ6rmvPYg4J0/0LSH71vUTzspI=; b=y2fjFRtIJzywDwg48qRoxT6UIrXava3tkgNkvgRpiof9eT8RsVLSptaYHU537ApT3oTUTD AnnbiH0QdoxjhYIIdSCu40ghVd+paSajEbLYrYynrYCcEVNl9QvOOWzqKyD0gXDW+L9/cD NGi8qrQNwHGiRq86v9G14H7wZo37CpyuKeDkEKKKqTKeJGbteg7/zBWOJn0s5zSEqt+G8U 8Wpn7vbGDVQxbiPAOlLRmh8D8ThUSDkRlbUPN/C9tOUv5yd3bydr4oxplppctVV/+H6yYU muv/fvrRBIkoFT4TfdVsgK9vTgHuVc4Lvt3G92H4BQcE0TW0VOnKFMVhNmk7mA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708233385; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+RA80Vq9JRQs9JqflgZ6rmvPYg4J0/0LSH71vUTzspI=; b=MlExyRuGGD5GBgThj9Y55jl0z/kKlMgBF+63opF8n+9tCV6wlTpqHAWl4g92tvM5+O3job Pm5WuWFnVvN+T/W2K/s4aevfa0eAlBc68/QbHUL7D0Qp+FwDo0U4rCCYV7xwxvAQvP2SRr Y/SeHPCb14bmjypidAepwSY/jS7BSDGrrDHZZ9Fd+bHps5rHlSwU+6lQxrP8GwQZC8Nois UMVIuPeoRjNfRFRp2MBYR+Lh14i1VPcaVEF+QfGVhG9at78gNUMUPBB80th6ZAI6etI5Uy NmmhKyz+aNnxRQWWkQ3sixFm7JRFyKRPu3YPru9ZjJ8Y4Py9r4tfNy09qfg29Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708233385; a=rsa-sha256; cv=none; b=ZSLrmji43zTJboaqL9Zg1TX/BcG5bX+nMfuccwKM0QnQIFkqo1mgoUp7sN8skF3rim2Vy5 JjxiJ50QCepEU53ZTJ0iQZHHkBdMfRn/SYA03SWjIFL3KUU87y0GiHEEKmLFzjujg15H24 J4/rxSy3RIpZYt8FFk69PaNnMqh356SkzfRbVALcrzNcuKcZDPrgbWoTZrtecg900iLxj6 XiKBbSbJoX35VqAMZB3+FNe14ot87ZymlOa3Vjc/8Kuz/5xxQpozjLWmjmV6cnlbkknZQ5 BnqLGn0wq5wCvUnANqVITISa4PHVgfBNl/QKsNY3UvHxDOzze1PmcRXWgCy4yQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Tcv610sKrzdrH; Sun, 18 Feb 2024 05:16:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41I5GPq4096896; Sun, 18 Feb 2024 05:16:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41I5GPdO096893; Sun, 18 Feb 2024 05:16:25 GMT (envelope-from git) Date: Sun, 18 Feb 2024 05:16:25 GMT Message-Id: <202402180516.41I5GPdO096893@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Fechner Subject: git: 5a638f64132c - main - www/gitlab-ce: use sidekiq from ports List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mfechner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5a638f64132ce3edc3991a2672ac524d95b06030 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a638f64132ce3edc3991a2672ac524d95b06030 commit 5a638f64132ce3edc3991a2672ac524d95b06030 Author: Matthias Fechner AuthorDate: 2024-02-09 10:29:45 +0000 Commit: Matthias Fechner CommitDate: 2024-02-18 04:53:32 +0000 www/gitlab-ce: use sidekiq from ports 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. --- www/gitlab-ce/Makefile | 1 + www/gitlab-ce/files/patch-Gemfile | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 791e2fa3fb90..e83aaff711b7 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -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 \ diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index db38faea6542..3e6bc6165173 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/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 @@ -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