Date: Sun, 7 Mar 2021 09:53:07 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567554 - in head: devel/gitlab-runner devel/gitlab-shell net/gitlab-agent Message-ID: <202103070953.1279r7Or084731@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Sun Mar 7 09:53:07 2021 New Revision: 567554 URL: https://svnweb.freebsd.org/changeset/ports/567554 Log: Drop gomod-deps in favor of gomod-vendor USES=go has gomod-vendor that does the same. Let's not reinvent the wheel. Approved by: mfechner, swills Differential Revision: https://reviews.freebsd.org/D29080 Modified: head/devel/gitlab-runner/Makefile head/devel/gitlab-shell/Makefile head/net/gitlab-agent/Makefile Modified: head/devel/gitlab-runner/Makefile ============================================================================== --- head/devel/gitlab-runner/Makefile Sun Mar 7 08:19:47 2021 (r567553) +++ head/devel/gitlab-runner/Makefile Sun Mar 7 09:53:07 2021 (r567554) @@ -203,10 +203,6 @@ post-patch: @${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/ @${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-arm.tar.xz ${WRKSRC}/out/docker/ -gomod-deps: patch - (cd ${WRKSRC} && go mod vendor) - (cd ${WRKSRC} && modules2tuple vendor/modules.txt) - pre-build: @cd ${WRKSRC} && go-bindata \ -pkg docker \ Modified: head/devel/gitlab-shell/Makefile ============================================================================== --- head/devel/gitlab-shell/Makefile Sun Mar 7 08:19:47 2021 (r567553) +++ head/devel/gitlab-shell/Makefile Sun Mar 7 09:53:07 2021 (r567554) @@ -27,7 +27,7 @@ GROUPS= git # for go dependencies USE_GITHUB= nodefault -# generated with: make gomod-deps +# generated with: make gomod-vendor # 38dd GH_TUPLE= \ DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ @@ -76,11 +76,6 @@ post-patch: ${MV} ${WRKSRC}/config.yml.example ${WRKSRC}/config.yml.sample ${CP} ${WRKSRC}/config.yml.sample ${WRKSRC}/config.yml ${REINPLACE_CMD} -e 's|VERSION_STRING :=.*|VERSION_STRING := v${PORTVERSION}|g' ${WRKSRC}/Makefile - -# Build the go deps, use `pkg install modules2tuple` -gomod-deps: patch - (cd ${WRKSRC} && go mod vendor) - (cd ${WRKSRC} && modules2tuple vendor/modules.txt) pre-build: @(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} build) Modified: head/net/gitlab-agent/Makefile ============================================================================== --- head/net/gitlab-agent/Makefile Sun Mar 7 08:19:47 2021 (r567553) +++ head/net/gitlab-agent/Makefile Sun Mar 7 09:53:07 2021 (r567554) @@ -208,10 +208,6 @@ GO_TARGET= ./cmd/kas PLIST_FILES= bin/kas -gomod-deps: patch - (cd ${WRKSRC} && go mod vendor) - (cd ${WRKSRC} && modules2tuple vendor/modules.txt) - do-install: ${INSTALL_PROGRAM} ${WRKDIR}/bin/kas ${STAGEDIR}${PREFIX}/bin/kas
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103070953.1279r7Or084731>