From owner-dev-commits-ports-all@freebsd.org Sat Jul 3 07:50:34 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AC04164D4BA; Sat, 3 Jul 2021 07:50:34 +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 4GH3yy4Wfbz3wPd; Sat, 3 Jul 2021 07:50:34 +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 7FC5623D07; Sat, 3 Jul 2021 07:50:34 +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 1637oYAE092750; Sat, 3 Jul 2021 07:50:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1637oYmN092738; Sat, 3 Jul 2021 07:50:34 GMT (envelope-from git) Date: Sat, 3 Jul 2021 07:50:34 GMT Message-Id: <202107030750.1637oYmN092738@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: da75672c1fa6 - main - www/gitlab-ce: Fixed problem with asset compilation 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: da75672c1fa6ed42eb2413b52aa7bcb0b1117ed3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Jul 2021 07:50:34 -0000 The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=da75672c1fa6ed42eb2413b52aa7bcb0b1117ed3 commit da75672c1fa6ed42eb2413b52aa7bcb0b1117ed3 Author: Matthias Fechner AuthorDate: 2021-07-03 07:45:12 +0000 Commit: Matthias Fechner CommitDate: 2021-07-03 07:50:19 +0000 www/gitlab-ce: Fixed problem with asset compilation The old autoprefixer gem used by gitlab cause at the upgrade the following error message (cause by newer execjs gem): Done in 0.68s. rake aborted! ExecJS::ProgramError: TypeError: Cannot read property 'version' of undefined eval (eval at ((execjs):1:213), :1:10) (execjs):1:213 (execjs):19:14 (execjs):1:40 Object. ((execjs):1:58) Module._compile (node:internal/modules/cjs/loader:1109:14) Object.Module._extensions..js (node:internal/modules/cjs/loader:1138:10) Module.load (node:internal/modules/cjs/loader:989:32) Function.Module._load (node:internal/modules/cjs/loader:829:14) Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:76:12) /usr/local/www/gitlab-ce/lib/gitlab/task_helpers.rb:18:in `invoke_and_time_task' /usr/local/www/gitlab-ce/lib/tasks/gitlab/assets.rake:59:in `each' /usr/local/www/gitlab-ce/lib/tasks/gitlab/assets.rake:59:in `block (3 levels) in ' /usr/local/bin/bundle:23:in `load' /usr/local/bin/bundle:23:in `
' Tasks: TOP => assets:precompile (See full trace by running task with --trace) --- www/gitlab-ce/Makefile | 4 ++-- www/gitlab-ce/files/patch-Gemfile | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index b1d84d407ccf..05bdad3578ea 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -2,7 +2,7 @@ PORTNAME= gitlab-ce PORTVERSION= 14.0.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -176,7 +176,7 @@ MY_DEPENDS= git>=2.32.0:devel/git \ rubygem-gitlab_chronic_duration>=0.10.6.2<0.10.7:devel/rubygem-gitlab_chronic_duration \ rubygem-rack-proxy06>=0.6.0<0.7.0:www/rubygem-rack-proxy06 \ rubygem-sassc-rails-rails61>=2.1.0<2.2.0:textproc/rubygem-sassc-rails-rails61 \ - rubygem-autoprefixer-rails1020>=10.2.0.0<10.2.1:textproc/rubygem-autoprefixer-rails1020 \ + rubygem-autoprefixer-rails>=10.2.5.1<10.2.6:textproc/rubygem-autoprefixer-rails \ rubygem-terser>=1.0.2:textproc/rubygem-terser \ rubygem-addressable>=2.7<3:www/rubygem-addressable \ rubygem-gemojione>=3.3<4.0:graphics/rubygem-gemojione \ diff --git a/www/gitlab-ce/files/patch-Gemfile b/www/gitlab-ce/files/patch-Gemfile index a34a04d953af..9ad5d8137744 100644 --- a/www/gitlab-ce/files/patch-Gemfile +++ b/www/gitlab-ce/files/patch-Gemfile @@ -17,6 +17,15 @@ gem 'graphlient', '~> 0.4.0' # Used by BulkImport feature (group::import) gem 'hashie' +@@ -286,7 +285,7 @@ gem 'gitlab_chronic_duration', '~> 0.10.6.2' + gem 'rack-proxy', '~> 0.6.0' + + gem 'sassc-rails', '~> 2.1.0' +-gem 'autoprefixer-rails', '10.2.0.0' ++gem 'autoprefixer-rails', '10.2.5.1' + gem 'terser', '1.0.2' + + gem 'addressable', '~> 2.7' @@ -309,7 +308,7 @@ gem 'sentry-raven', '~> 3.1' # and https://github.com/pganalyze/pg_query/pull/213 are # released. gitlab-labkit will need to be updated to use the pg_query