From nobody Sun Jul 21 06:56:43 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 4WRZ2h2dmPz5QtR9; Sun, 21 Jul 2024 06:56:44 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRZ2h01hqz4ZWk; Sun, 21 Jul 2024 06:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721545004; 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=VXGKdEvMDIc+oPN9EPs/G4dFhGZfdvks/vd5sU9GWU4=; b=roudkC3ACYMmKlDAJ5eRFuoO5SuIrGMBrQXtTcy03aMg1bxxbaTAoNQNlt2xwZDmKHtQkH SWq45OX4FuVPDaIZgxg2O0iQCWZcECpz+XB6kLGVFOUSM0AAZ3/UpkOuV+uUHCij4uPS0u EkmFGpoRYHPHv9JdpJ+kedtDSqDSU6dH6t+enCxMrsTysY9yCbv9o0TXH5KVJ3ism4uq6g cXzhyIAS78fYgDlLBOSHmJdkYUFQw7BG97M+wmrcFACX7KezfGdloM1uv+SKokErgmVjIl MbXGO8Olu4A2neWNw/40QNKWclQVlsNPWsQmAnFI2pL+caSq42eiJbGRXx9BDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721545004; a=rsa-sha256; cv=none; b=cEUcI301yNKnsjZtbqag/90GzvIxwGdBa3a0idUaa4Gya9AYFnJLUZqO2+qWHiwONFNx3B mJf1LEB8V2NU5yVdSP/ooWV8Ee+78+JRm3HpwzTJVpu9mlylvXJN/cxKja4u24nk7arM/x RydSgop/kXTIhgkKTuGg1gPevyJUeYGf17LRGacdapsevpRlOrAZnGCsY5umSQh/59eUVB L9yxrProj0dPGim/hKogW3otANDxqwSBySg/RCbarDKoJGqSNexH/xX2Y7MaWyUC9+UKV1 OrLu88XuDzy2shmFPeJCETjPGMmDBWlDdIEgI9gey0SLSh0+vZ52En/Eq5iTxg== 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=1721545004; 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=VXGKdEvMDIc+oPN9EPs/G4dFhGZfdvks/vd5sU9GWU4=; b=cwGpw5yeogW+0RbxQRZ77QffS3nv91DaNIQxFfDIyc0DWDCiUNlGQjeIpa/9eOUrGHUBlM 2iB1Ag69lcGTE4GFscQ/SeYyMQSDunBmJryN81+5wHlF0S7wERnvU6L4E3cyz+A99X42Hh DPDCB9uUxmeOAeNwMHS7xZA3LdVigmTQBqlzElNgPI5VVwCYj/b0gwHlj58f41trmzR1iJ hBahUINEBZGWB2DiK0SGc85DyfLMtxQXfmEuAG1a3bgJTFsuyeVNcyZdnqaeRDpGMHc3wv 0ta8UlmK+GI8DX3edgwY0S6PafOzXoF3ZoDMsLiGYN62ALV8sOhe45IR0C688w== 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 4WRZ2g61zxzqqD; Sun, 21 Jul 2024 06:56:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46L6uhFN068987; Sun, 21 Jul 2024 06:56:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46L6uhcW068984; Sun, 21 Jul 2024 06:56:43 GMT (envelope-from git) Date: Sun, 21 Jul 2024 06:56:43 GMT Message-Id: <202407210656.46L6uhcW068984@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: 1a0de684fd52 - 2024Q3 - www/gitlab-workhorse: use new feature from go.mk to download go.mod from gitlab 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: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-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/2024Q3 X-Git-Reftype: branch X-Git-Commit: 1a0de684fd52093cd3263b0f278f5f93f6623402 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a0de684fd52093cd3263b0f278f5f93f6623402 commit 1a0de684fd52093cd3263b0f278f5f93f6623402 Author: Matthias Fechner AuthorDate: 2024-07-03 09:18:42 +0000 Commit: Matthias Fechner CommitDate: 2024-07-21 05:38:56 +0000 www/gitlab-workhorse: use new feature from go.mk to download go.mod from gitlab (cherry picked from commit 6fe6efa7b013b5caf76d0734006c5f7f0be5ad53) --- www/gitlab-workhorse/Makefile | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index ef2d5307bfff..d31a92e81359 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -18,29 +18,12 @@ USES= gmake go:modules,no_targets,1.22 USE_GITLAB= yes GL_ACCOUNT= gitlab-org GL_PROJECT= gitlab-foss +GO_MOD_DIST= gitlab MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" MAKE_ENV+= ${GO_ENV} WRKSRC_SUBDIR= workhorse # found in work/gitlab-foss*/workhorse/go.mod -#GO_MODULE= gitlab.com/gitlab-org/gitlab/workhorse - -# for go dependencies -# Gitlab hosts there dependencies on their own platform and not on go-proxy -# so we download the required go.mod file from gitlab -# lines are taken from go.mk -# --------------------------- -FETCH_DEPENDS= ${GO_CMD}:${GO_PORT} -MASTER_SITES+= https://gitlab.com/gitlab-org/gitlab-foss/-/raw/v${DISTVERSION}/workhorse/ -DISTFILES+= go.mod -DIST_SUBDIR= go/${PKGORIGIN:S,/,_,g}/${DISTNAME} -EXTRACT_ONLY+= ${DISTFILES:N*.mod\:*:N*.mod:C/:.*//} -_USES_fetch+= 800:go-post-fetch -go-post-fetch: - @${ECHO_MSG} "===> Fetching ${GO_MODNAME} dependencies"; - @(cd ${DISTDIR}/${DIST_SUBDIR}; \ - [ -e go.mod ] || ${RLN} ${GO_MODFILE} go.mod; \ - ${SETENV} ${GO_ENV} GOPROXY=${GO_GOPROXY} ${GO_CMD} mod download -x all) -# --------------------------- +GO_MODULE= gitlab.com/gitlab-org/gitlab/workhorse PLIST_FILES= bin/gitlab-resize-image \ bin/gitlab-workhorse \