From nobody Fri Mar 10 10:20:29 2023 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 4PY2B608wfz3xMqJ; Fri, 10 Mar 2023 10:20:30 +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 4PY2B566BPz4PK3; Fri, 10 Mar 2023 10:20:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678443629; 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=CScSy0L70XyZSquDSK9wMy70lIauSN/WhUbhPRmoLAo=; b=EobcMnppDUkPIZyxb65OG8qKhYSlmHwO/c6VNp7zUBIC5z19WsfjqkVbyg329xSJ4SYh1G tY3w8UbgKrWXS91Wj+tPmBeuj/xlGHkcD901G6zud9yshi1pptIKVqG68w8Vj6n9d6gZ2X u7AM8A3Dk3lR3vXwoyUZ1PsyB6QrSw2oUJ/xlBSIbgaZKfgmKtWJ92L5wdWDcZm3uJFG6q mazN4dURC1BVDPr2uEQHtqBFQzYtkJho8bLiyKVGgD5T9CfGezU8O2bSBgXc+CA4AeCFu0 PJSngrEdqPQ0m/whF8pBwnKAfELSKXw+arFtq6DS4ZfyblSO4okP8WLA9gN9bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678443629; 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=CScSy0L70XyZSquDSK9wMy70lIauSN/WhUbhPRmoLAo=; b=UnnBTlNYBF1VUurOXelwtg6cneChAGCDYzGMhVBQv8QyWRDCso7yp7dwCmL8nB6m9bIEAb nvzH/a2bIZjcMV2N4d9EayVT551ctqiZZkRSNJS8pbEKeQbVv/k9DieG/gGp7sxQRqHxDY 4aOWnmkWUKQvgGbhhTvpYfoIDWEDDTuC3j4ofnPCWA1uz42Wlwbo/VizGrOI67P8gcWt+Y sFIeFQy2xmjcpIJyqUH0nk5I6kyet79+c2ghCCnklnhW/FKc1nUwE4RdGeNObG8eqNnrGi 9oBVe/svCb5eVB4GIJ62336q/H5UKeQuJ3i5mmZBvqdffHtiCB12+DgZq3CSmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678443629; a=rsa-sha256; cv=none; b=QCII6LSpfvvkMygOSzWeGbTAgCEYfGe7EHR65wurm4agfXUBTElEsgWp4B95AaN9PQchGl 2DihcKH6ExXq+Gm9CIic2J+XoqUDdiH54k+l6UfqV0iPjr3OLoZjDNZjjs9+ZEsWsTDXRh xy2suDnOwu0GpDrH4jMgOV/IWx6uqCxihb+QFtZhSffBhBc2fZRptlUciT/r+AmGjBF7Pi XKFEcvmfJGwbNGhDCslp8Fb44Uw8bxeqsGC1uC10N3yoXl5CffKmZlBc4U8u6mZaj+88KI MlROHsvPJuHO5T6VM4Bmeq3xJvd9vKPw9KMlbhD4+KST601i1tpJ/DHe/WyeEg== 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 4PY2B550b9zkML; Fri, 10 Mar 2023 10:20:29 +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 32AAKTsp085533; Fri, 10 Mar 2023 10:20:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32AAKT0p085532; Fri, 10 Mar 2023 10:20:29 GMT (envelope-from git) Date: Fri, 10 Mar 2023 10:20:29 GMT Message-Id: <202303101020.32AAKT0p085532@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: 090e852bd7cb - main - www/gitlab-ce: fix a problem in the asset compile step 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: 090e852bd7cb604a4fdff274021c4b792cd5285a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=090e852bd7cb604a4fdff274021c4b792cd5285a commit 090e852bd7cb604a4fdff274021c4b792cd5285a Author: Matthias Fechner AuthorDate: 2023-03-10 10:16:06 +0000 Commit: Matthias Fechner CommitDate: 2023-03-10 10:20:00 +0000 www/gitlab-ce: fix a problem in the asset compile step Make sure that files having an executable bit keep this executable bit. This fixes a problem of the last step in the asset compile step fails due to missing executable permission on a script. It does not have any impact on the installation itself as the last step is just failing which is just a check which is done after all assets are compiled. Thanks a lot to @tz and @moin pointing to it and helping to understand the source for it. --- www/gitlab-ce/Makefile | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/www/gitlab-ce/Makefile b/www/gitlab-ce/Makefile index 71e4726ee9f0..8282ee32f763 100644 --- a/www/gitlab-ce/Makefile +++ b/www/gitlab-ce/Makefile @@ -292,6 +292,15 @@ KERBEROS_BUILD_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel KERBEROS_RUN_DEPENDS= rubygem-timfel-krb5-auth>=0.8<1:security/rubygem-timfel-krb5 KERBEROS_EXTRA_PATCHES_OFF= ${FILESDIR}/extra-patch-Gemfile-kerberos-off +SHEBANG_FILES= scripts/build_qa_image \ + scripts/db_tasks \ + scripts/rails-update-bisect \ + scripts/generate-e2e-pipeline \ + scripts/frontend/execute-on-staged-files.sh \ + scripts/frontend/start_storybook.sh \ + .lefthook/pre-push/merge_conflicts \ + qa/bin/test + post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config/gitlab.yml.example \ ${WRKSRC}/config/puma.rb.example \ @@ -335,7 +344,10 @@ do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/shared/artifacts/tmp/work ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/vendor/assets/stylesheets ${MKDIR} ${STAGEDIR}${PREFIX}/www/${PORTNAME}/workhorse/changelogs/unreleased - (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME}) + # Skip file having an executable bit + (cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/${PORTNAME} "-not ( -type f -perm -a=x )") + # now copy all files having an execution bit and preserve to x bit (this fixes some issues we saw) + (cd ${WRKSRC} && ${COPYTREE_BIN} . ${STAGEDIR}${PREFIX}/www/${PORTNAME} "-type f -perm -a=x") post-install: ${FIND} -s ${STAGEDIR}${WWWDIR} -not -type d | ${SORT} | \