From nobody Fri Oct 29 06:34:28 2021 X-Original-To: dev-commits-ports-main@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 5FB771820916; Fri, 29 Oct 2021 06:34:28 +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 4HgXhh2FhPz3DFm; Fri, 29 Oct 2021 06:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2D33312A10; Fri, 29 Oct 2021 06:34:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19T6YSWn015571; Fri, 29 Oct 2021 06:34:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19T6YSr6015570; Fri, 29 Oct 2021 06:34:28 GMT (envelope-from git) Date: Fri, 29 Oct 2021 06:34:28 GMT Message-Id: <202110290634.19T6YSr6015570@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: fcfd49ce7c4f - main - www/gitlab-ce: force gitlab-ce to use node16 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: fcfd49ce7c4f924f4ba517114609662d030357b1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=fcfd49ce7c4f924f4ba517114609662d030357b1 commit fcfd49ce7c4f924f4ba517114609662d030357b1 Author: Matthias Fechner AuthorDate: 2021-10-28 14:41:20 +0000 Commit: Matthias Fechner CommitDate: 2021-10-29 06:33:39 +0000 www/gitlab-ce: force gitlab-ce to use node16 As www/node was upgrade to version 17 it causes the upgrade process of gitlab-ce to fail. Gitlab requires yarn which requires node but the modules gitlab is using are not supporting node 17 yet. --- devel/rubygem-webpacker-rails61/Makefile | 3 ++- www/gitlab-ce/Makefile | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/devel/rubygem-webpacker-rails61/Makefile b/devel/rubygem-webpacker-rails61/Makefile index 68cbfc07b946..fd7847c8adfc 100644 --- a/devel/rubygem-webpacker-rails61/Makefile +++ b/devel/rubygem-webpacker-rails61/Makefile @@ -1,5 +1,6 @@ PORTNAME= webpacker PORTVERSION= 5.4.3 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails61 @@ -14,7 +15,7 @@ RUN_DEPENDS= rubygem-activesupport61>=5.2:devel/rubygem-activesupport61 \ rubygem-rack-proxy>=0.6.1:www/rubygem-rack-proxy \ rubygem-railties61>=5.2:www/rubygem-railties61 \ rubygem-semantic_range>=2.3.0:devel/rubygem-semantic_range \ - yarn:www/yarn + yarn:www/yarn-node16 USES= gem USE_RUBY= yes diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index e847ebaf0707..c572fe269d11 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -21,7 +21,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ gitlab-shell>=13.21.1:devel/gitlab-shell \ gitlab-workhorse>=${PORTVERSION}:www/gitlab-workhorse \ redis>=6.0.14:databases/redis \ - yarn>=1.10.0:www/yarn \ + yarn-node16>=1.10.0:www/yarn-node16 \ gtar>0:archivers/gtar \ bash>0:shells/bash \ rubygem-rails61>=6.1.4.1<6.1.4.2:www/rubygem-rails61 \