From nobody Thu Jul 11 13:37:04 2024 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 4WKbPD3rpXz5QgBg; Thu, 11 Jul 2024 13:37:04 +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 4WKbPD2vMbz4sth; Thu, 11 Jul 2024 13:37:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720705024; 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=U2QS4h1mj+udNquGTz0zWd20O/jf2CPMDVQV3SOABVc=; b=irsntl4iCsjFgG22V7hCc3hCqD09WUpiwXfKsNswS+yzEdvHOLOot5LylTzFPbHGdcWMvx JlEMik91WSdBtbv6AOL8kdCDQYnoYY22G/mpiVjjseSh18aEV7uECsz8a1f3TeBTx6jtYz giX1gHABl60KSFPy3Y1pJc+LO8kx29LlKhhwlB4zPjkYgie+JWF+7y53cLg2of9ruf1HXB CxVhYk83x9fJ/Ak2OZ1DJsa2IWSp2FLfbuOfszk5cKO8JwNOfAYZ/ngIYLUvrbUfm1ChiC 4lVIENzVV4XAAJELYWQgR7A9BJMcIBxc1HSqfT+6JckIRPjDPtD99f37qUVm7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720705024; a=rsa-sha256; cv=none; b=En5SwTdkltLotIOucWvqHWSs2fueCtQSHOm7MJ+MaDTPshK3YWcAXmykNpcJ7wKTxXQs5O fFIMB8CvkwvJTeKW/aHKdj0cgzc2C9V3G+4kcXdtN/wKN2lxjRW/9s59KowwgcJ/hlx/uj /56k/5X0qIYftsJZudR4XMmbxV5UAQyICic8xEKtXybWGJubQxppZk0MyJUoVHO1dDHLkG S803vFwbP69OMHnui2cRNgwu/cF2ZOwl1Kb9ZwbrJ8IsAOVa6lj4xookjGNNZBGCLs7Bai uNbT/7/FDUdKFH1nm4J5Rc5wkvciLgk1oBvpXvR8EFJuxnef7bsMeAb0hq9gOw== 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=1720705024; 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=U2QS4h1mj+udNquGTz0zWd20O/jf2CPMDVQV3SOABVc=; b=OQQYV3ixT4ugFSmM/rGsyzWno+JgxxJCM0WSb8/03vgCWnMQzC1pmh8gg0oN1Rg3ICTGnq eUaxCAh5Gixsiar8NdNj5CZIfxmeUp1t90Bv21W7DkTzLl4bsES45X/l9J+QjjcShdkTcR Dzx8P/09gdYD5ayX5Km8kYfZXWvkX8LLHEkXvoCgaEN0ZR3Y8MjLiemLRMwA7RmAVkmie1 yJEPXZsfjnNN3j9+BszT+P2uQ2GYPKEw7nbQmFi5Xfl01jsIQRMcS7GQw9P44O1xmpWNNq B3zNLUt3H3aqtIAInF6ZjQHTImUMmoZEPL2Sp+iKb/0sDTXxU40UoNpHVqaTSQ== 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 4WKbPD2VWCz12Yj; Thu, 11 Jul 2024 13:37:04 +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 46BDb4UB062947; Thu, 11 Jul 2024 13:37:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46BDb4Ep062944; Thu, 11 Jul 2024 13:37:04 GMT (envelope-from git) Date: Thu, 11 Jul 2024 13:37:04 GMT Message-Id: <202407111337.46BDb4Ep062944@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: 6fe6efa7b013 - main - www/gitlab-workhorse: use new feature from go.mk to download go.mod from gitlab 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 6fe6efa7b013b5caf76d0734006c5f7f0be5ad53 Auto-Submitted: auto-generated The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=6fe6efa7b013b5caf76d0734006c5f7f0be5ad53 commit 6fe6efa7b013b5caf76d0734006c5f7f0be5ad53 Author: Matthias Fechner AuthorDate: 2024-07-03 09:18:42 +0000 Commit: Matthias Fechner CommitDate: 2024-07-11 13:36:42 +0000 www/gitlab-workhorse: use new feature from go.mk to download go.mod from gitlab --- 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 \