From nobody Fri Feb 23 15:09:25 2024 X-Original-To: dev-commits-ports-branches@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 4ThD1x6hq1z59twj; Fri, 23 Feb 2024 15:09: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 4ThD1x3Sfkz4GmM; Fri, 23 Feb 2024 15:09:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708700965; 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=Dl026LImtgwzOzJVwp/4S/ouLtSjFuRTwn5LcWgsP6k=; b=Nqh0ivNOU6xm54v8wxKzbVV73g6VO+zFrve4s5POnd4VRMv1lM+pLKQkD1VpzwEl3REJ4j Pv8fBqMsdT9UC8wyTaixe3j/rE6rfl7eDQi/EOJoM/HbDXbfL4VhRZ3WREEfiCsRhKfQzx z3Ml3QZCqJE2+wiyGrvLONkzcYmZbS6CYkq4wVbVcplN81boc0j70UoXJ16US8ZkLjXCGT 5ciJN+Vm7RXRCcT8ouEy4gfhnF7ZN/3Shndk2KyaBLdUQSyoomA6TahvMo6n4NYTYqGBgD jY4iMKZBzy2iLSDWfS1vP7Q3PjGLfXKrZp98PgQR72wWj8aCWja8IAhB1sDsTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708700965; a=rsa-sha256; cv=none; b=fJy7J1AsMfk6z+UEF2GLUkb2teMxhfh9cUnczaxImSkWr+dlCCGXkN/VS1jFtA583w7+po a2gvlwgBPsThgOBVL1qBWIupJxe116TSBhxZ5or/MG4S4n0SfgINDJa5KvxuNf0422HIZP eXaQ/paDsZrChDtAXl6b4P6a53N5aHc1R4xEkUFtrwJjhAa/RoymSu7i4g4gFzBLA2L5B+ Y6iiT3apRKKt9TllRZ+EC6gm0QsnC5zOlxnT5R75ztnrx6ltcYsG9WtqPLLyWKA1R5fr9n I53FRLEOoTr5XtOwJ6ahEH1VYQ5qskG7qFP+jYkqeb0dpTICn/3Wlrhs94fM1g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708700965; 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=Dl026LImtgwzOzJVwp/4S/ouLtSjFuRTwn5LcWgsP6k=; b=dKLbx9N5klhpl5JUXKxGfLWqSLi2aNM4B7TFpZVZ79RPedMC4kPKG/nixMQD3B2uCZtL7/ oPjkWfUBTMChRTAMOQ25kVkoev0JxyI7JEyAcr5lOkScNLeVZlmcYkaHIEmTRrBi4uJm9U aE8bPRudBU+fkggSpXbnU1FbguCwynrhoUTXewRw8QGpH8CZ2YiqlU3q7fwTWKj/2loKYD NYAXzSEimx4dJ5hCV0s2jspqU4VR8YUJBvlUBgSCz3fwQrRtkLGUpxlraRPOwTYmSKoSHb hD7ME0ubS+VpA1U4b7QAmRFhc3/AHndPMmu6gSVaw9NbPGWQ7+PkFOATtR7/sQ== 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 4ThD1x1wCkzKsw; Fri, 23 Feb 2024 15:09: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 41NF9PYC028396; Fri, 23 Feb 2024 15:09:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41NF9PVQ028393; Fri, 23 Feb 2024 15:09:25 GMT (envelope-from git) Date: Fri, 23 Feb 2024 15:09:25 GMT Message-Id: <202402231509.41NF9PVQ028393@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Matthias Fechner Subject: git: 4fc8d7a29dbc - 2024Q1 - www/gitlab-ce: use sidekiq from ports List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2024Q1 X-Git-Reftype: branch X-Git-Commit: 4fc8d7a29dbc70957548b563490eedfab489d827 Auto-Submitted: auto-generated The branch 2024Q1 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=4fc8d7a29dbc70957548b563490eedfab489d827 commit 4fc8d7a29dbc70957548b563490eedfab489d827 Author: Matthias Fechner AuthorDate: 2024-02-09 10:29:45 +0000 Commit: Matthias Fechner CommitDate: 2024-02-23 14:23:54 +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. (cherry picked from commit 5a638f64132ce3edc3991a2672ac524d95b06030) --- 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