From nobody Thu Dec 14 12:22:21 2023 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 4SrWgx6hVZz53v6h; Thu, 14 Dec 2023 12:22:21 +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 4SrWgx5wxKz4bb4; Thu, 14 Dec 2023 12:22:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702556541; 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=KSLDzP9x99nwidwc20AFBABlGr3lLWE9Ufr500elYdI=; b=Ulqp2djnxh3C2mZ4PXH2z651Gm9Ardknd+X4nn192IQsOiTTyGA1V1tw4yTqhiF/cuPLgg Yjb8eQOKaBcCpYbfDzmhE6h27KmVC+2cXpH5kyN6NUWEkEf9+o0FohEmy/XjToFkrhUI5a QNHT1fqp8NoxIqOnRD/vLui+mG9F1gS+5KACUESDsH160pTUjZvF8S/ucRgTK6uZ3mOKKV 7MAF8uuTe08TBA5jlJNQEkmIYh/U9dG3I+ukYF95FBuc21q/vo+DTcVEJO9D+x01midXvv 1Aq1XBC7zPIv7AJ8ozu0oISzNhPq43G0J1zuOOUuR2Xlklp3t9Nz09pUD57Rzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702556541; a=rsa-sha256; cv=none; b=sOazWgIBVj7oOYijmievtB+ik0k2A4MqMy5OfJeikj9cH3bRiH5/zf4CJjYk7FqjL9x55E SipBmYN3yVVU+gNFhG769e4fzgpUSODN9pm1Q8HxTkgfQKD+GPtdc9bpAHLPivkoPoNArF l8D7VVOKmKUgK15pi9vsqQoQPLldZSp1BbtIDHH+xvK3TcZKqYA9E+sbzdtYv2mR3asmhu 2VQm7rNI0P5I8RvmhUnyfb/FQyolLNNqcAYgVvTASAFRSlhuA2Kcg7iX0EADtErJGXRmzM OIuytV3+BsVpi17YOnaR6Uts5awBqBeoswJrzAMXeEnqaIcy0YuxkaGLTL9Ftw== 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=1702556541; 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=KSLDzP9x99nwidwc20AFBABlGr3lLWE9Ufr500elYdI=; b=nQlYAP6FyqU2e5UBKWD8ZuNBHNbqsad/wML8A2u2t5ZbeiCmkfiO4vPwlvBmicpWkeiHY+ tKRnsCN7bntW1jbDtbvAnUlM4KtyXu33d/wEPhBWwCzZPnsMtjT3FSwqhARrxH3/4cl8uL 9/S/lcsR08h8UZpxnfIl63QU5/1fSYonPtMNrudKJRzqMactqb4WaoECf0S7PkN7PEe0G2 yPoMdXyziLUTh9t5K2NckVUPicG8Z3gPTpoMU0RpaWMYGmtRGii3dTmhJJuifyYAOLPlaE iMj032XtkJ1XK9JtrMKwzCFf02CGnh2Z/DGQRl1zdGoK5g9+OfQBjGsNub6U+g== 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 4SrWgx4znwzCBd; Thu, 14 Dec 2023 12:22:21 +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 3BECMLox044459; Thu, 14 Dec 2023 12:22:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BECML8g044456; Thu, 14 Dec 2023 12:22:21 GMT (envelope-from git) Date: Thu, 14 Dec 2023 12:22:21 GMT Message-Id: <202312141222.3BECML8g044456@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: ace1d95ae944 - main - www/gitlab-ce: fix database migration error 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: ace1d95ae944db6dacc492e4fe12afdb2a771e0c Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=ace1d95ae944db6dacc492e4fe12afdb2a771e0c commit ace1d95ae944db6dacc492e4fe12afdb2a771e0c Author: Matthias Fechner AuthorDate: 2023-12-14 12:19:37 +0000 Commit: Matthias Fechner CommitDate: 2023-12-14 12:22:11 +0000 www/gitlab-ce: fix database migration error Database migration step requires vite_ruby 3.3 even if a higher version is allowed. Following error is fixed: E, [2023-12-14T14:15:11.286071 #1116] ERROR -- : Failed to check mode for Vite: vite-plugin-ruby@^3.2.2 might not be compatible with vite_ruby-3.5.0 You may disable this check if needed: https://vite-ruby.netlify.app/config/#skipcompatibilitycheck You may upgrade both by running: bundle exec vite upgrade rake aborted! ArgumentError: vite-plugin-ruby@^3.2.2 might not be compatible with vite_ruby-3.5.0 You may disable this check if needed: https://vite-ruby.netlify.app/config/#skipcompatibilitycheck You may upgrade both by running: bundle exec vite upgrade /usr/local/www/gitlab-ce/config/environment.rb:7:in `' :38:in `require' :38:in `require' Tasks: TOP => db:migrate => db:load_config => environment (See full trace by running task with --trace) --- devel/Makefile | 1 + devel/rubygem-vite_rails-rails70/Makefile | 3 ++- devel/rubygem-vite_ruby33/Makefile | 24 ++++++++++++++++++++++++ devel/rubygem-vite_ruby33/distinfo | 3 +++ devel/rubygem-vite_ruby33/pkg-descr | 1 + www/gitlab-ce/Makefile | 2 +- 6 files changed, 32 insertions(+), 2 deletions(-) diff --git a/devel/Makefile b/devel/Makefile index b4ba7d8ed336..49c526d70c4a 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -7557,6 +7557,7 @@ SUBDIR += rubygem-virtus SUBDIR += rubygem-vite_rails-rails70 SUBDIR += rubygem-vite_ruby + SUBDIR += rubygem-vite_ruby33 SUBDIR += rubygem-warbler SUBDIR += rubygem-warden SUBDIR += rubygem-warning diff --git a/devel/rubygem-vite_rails-rails70/Makefile b/devel/rubygem-vite_rails-rails70/Makefile index 4ac6ec3e1345..6aee9fca7b33 100644 --- a/devel/rubygem-vite_rails-rails70/Makefile +++ b/devel/rubygem-vite_rails-rails70/Makefile @@ -1,5 +1,6 @@ PORTNAME= vite_rails PORTVERSION= 3.0.17 +PORTREVISION= 1 CATEGORIES= devel rubygems MASTER_SITES= RG PKGNAMESUFFIX= -rails70 @@ -13,7 +14,7 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt RUN_DEPENDS= rubygem-railties70>=5.1<8:www/rubygem-railties70 \ - rubygem-vite_ruby>=3.2.2<4:devel/rubygem-vite_ruby + rubygem-vite_ruby33>=3.2.2<4:devel/rubygem-vite_ruby33 USES= gem diff --git a/devel/rubygem-vite_ruby33/Makefile b/devel/rubygem-vite_ruby33/Makefile new file mode 100644 index 000000000000..f0b3a1d78d5b --- /dev/null +++ b/devel/rubygem-vite_ruby33/Makefile @@ -0,0 +1,24 @@ +PORTNAME= vite_ruby +PORTVERSION= 3.3.4 +CATEGORIES= devel rubygems +MASTER_SITES= RG +PKGNAMESUFFIX= 33 + +MAINTAINER= mfechner@FreeBSD.org +COMMENT= Use Vite in Ruby and bring joy to your JavaScript experience +WWW= https://github.com/ElMassimo/vite_ruby + +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE.txt + +RUN_DEPENDS= rubygem-dry-cli>=0.7<2:devel/rubygem-dry-cli \ + rubygem-rack-proxy>=0.6.1<1.0:www/rubygem-rack-proxy \ + rubygem-zeitwerk>=2.2<3:devel/rubygem-zeitwerk + +USES= gem + +NO_ARCH= yes + +PLIST_FILES= bin/vite + +.include diff --git a/devel/rubygem-vite_ruby33/distinfo b/devel/rubygem-vite_ruby33/distinfo new file mode 100644 index 000000000000..fde6134da597 --- /dev/null +++ b/devel/rubygem-vite_ruby33/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1702555790 +SHA256 (rubygem/vite_ruby-3.3.4.gem) = 025e438385a6dc2320c8c148dff453f5bb1d4f056ce69c3386f47d4c388ad80c +SIZE (rubygem/vite_ruby-3.3.4.gem) = 31232 diff --git a/devel/rubygem-vite_ruby33/pkg-descr b/devel/rubygem-vite_ruby33/pkg-descr new file mode 100644 index 000000000000..61b2b926351a --- /dev/null +++ b/devel/rubygem-vite_ruby33/pkg-descr @@ -0,0 +1 @@ +Use Vite in Ruby and bring joy to your JavaScript experience diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 617739697476..ad9e40f0e100 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -1,6 +1,6 @@ PORTNAME= gitlab-ce PORTVERSION= 16.6.2 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= www devel