svn commit: r452200 - in head/devel/gitlab-runner: . files

[Steve Wills]

Author: swills
Date: Mon Oct 16 15:26:16 2017
New Revision: 452200
URL: https://svnweb.freebsd.org/changeset/ports/452200

Log:
  devel/gitlab-runner: update to 10.0.2

Deleted:
  head/devel/gitlab-runner/files/patch-common_version.go
Modified:
  head/devel/gitlab-runner/Makefile
  head/devel/gitlab-runner/distinfo

Modified: head/devel/gitlab-runner/Makefile
==============================================================================
--- head/devel/gitlab-runner/Makefile	Mon Oct 16 14:57:37 2017	(r452199)
+++ head/devel/gitlab-runner/Makefile	Mon Oct 16 15:26:16 2017	(r452200)
@@ -1,12 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	gitlab-runner
-PORTVERSION=	9.5.0
+PORTVERSION=	10.0.2
 CATEGORIES=	devel
 MASTER_SITES=	\
-		https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/repository/archive.tar.bz2?ref=v${PORTVERSION}&dummy=/ \
-		https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \
-		https://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm
+		https://gitlab.com/gitlab-org/gitlab-runner/repository/archive.tar.bz2?ref=v${PORTVERSION}&dummy=/ \
+		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \
+		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm
 DISTFILES=	\
 		${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		prebuilt-x86_64.tar.xz:dockerx64 \
@@ -24,10 +24,16 @@ RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
 		git:devel/git
 
 USES=		tar:bz2
-GITHASH=	413da38a72634601bf435f6215d6669cd5a4e40e
-GITREV=		413da38
-GITBRANCH=	9-5-stable
-WRKSRC=		${WRKDIR}/gitlab-ci-multi-runner-v${PORTVERSION}-${GITHASH}
+GITHASH=	a9a76a502bf69371d9c610d0b2814b4e0f3ae762
+GITREV=		a9a76a50
+GITBRANCH=	10-0-stable
+BUILT=		2017-10-04T12:39:04-00:00
+WRKSRC=		${WRKDIR}/gitlab-runner-v${PORTVERSION}-${GITHASH}
+GO_LDFLAGS=	-X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=${PORTVERSION} \
+		-X gitlab.com/gitlab-org/gitlab-runner/common.REVISION=${GITREV} \
+		-X gitlab.com/gitlab-org/gitlab-runner/common.BUILT=${BUILT} \
+		-X gitlab.com/gitlab-org/gitlab-runner/common.BRANCH=${GITBRANCH} \
+		-s -w                                           
 
 PLIST_FILES=	bin/gitlab-runner
 
@@ -41,13 +47,6 @@ post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-x86_64.tar.xz ${WRKSRC}/out/docker/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/prebuilt-arm.tar.xz ${WRKSRC}/out/docker/
 
-post-patch:
-	@${REINPLACE_CMD} \
-		-e "s!%%VERSION%%!${PORTVERSION}!g" \
-		-e "s!%%REVISION%%!${GITREV}!g" \
-		-e "s!%%BRANCH%%!${GITBRANCH}!g" \
-		${WRKSRC}/common/version.go
-
 do-build:
 	@cd ${WRKSRC} && go-bindata \
 		-pkg docker \
@@ -61,10 +60,13 @@ do-build:
 	@cd ${WRKSRC} && go fmt executors/docker/bindata.go
 	@${MV} ${WRKSRC}/vendor ${WRKSRC}/src
 	@${MKDIR} ${WRKSRC}/src/gitlab.com/gitlab-org
-	@${LN} -s ${WRKSRC} ${WRKSRC}/src/gitlab.com/gitlab-org/gitlab-ci-multi-runner
-	@cd ${WRKSRC} && ${SETENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build -o gitlab-ci-multi-runner
+	@${LN} -s ${WRKSRC} ${WRKSRC}/src/gitlab.com/gitlab-org/gitlab-runner
+	@cd ${WRKSRC} && \
+		${SETENV} CGO_ENABLED=0 GOPATH=${WRKSRC} go build \
+			-ldflags="${GO_LDFLAGS}" \
+			-o gitlab-runner
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/gitlab-ci-multi-runner ${STAGEDIR}${PREFIX}/bin/gitlab-runner
+	${INSTALL_PROGRAM} ${WRKSRC}/gitlab-runner ${STAGEDIR}${PREFIX}/bin/gitlab-runner
 
 .include <bsd.port.mk>

Modified: head/devel/gitlab-runner/distinfo
==============================================================================
--- head/devel/gitlab-runner/distinfo	Mon Oct 16 14:57:37 2017	(r452199)
+++ head/devel/gitlab-runner/distinfo	Mon Oct 16 15:26:16 2017	(r452200)
@@ -1,7 +1,7 @@
-TIMESTAMP = 1505611321
-SHA256 (gitlab-runner/gitlab-runner-9.5.0.tar.bz2) = 6de3f169534d95f9778f9f0f4f22318a582113bb1948b99857fd9dad6a3b8934
-SIZE (gitlab-runner/gitlab-runner-9.5.0.tar.bz2) = 2499170
-SHA256 (gitlab-runner/prebuilt-x86_64.tar.xz) = 84b34f511ac2294a13e61aa3f0c8b1db2f450d610c72dc3b84f5c865355ef154
-SIZE (gitlab-runner/prebuilt-x86_64.tar.xz) = 11106288
-SHA256 (gitlab-runner/prebuilt-arm.tar.xz) = 874e101bfa996b2ed4460a930429277f6eeaeb6d3f9fbcb962452b259be56f26
-SIZE (gitlab-runner/prebuilt-arm.tar.xz) = 9088532
+TIMESTAMP = 1508163224
+SHA256 (gitlab-runner/gitlab-runner-10.0.2.tar.bz2) = 3e4852766436188fbe954f3457e5a0a4ce141be0f3facb0bae62e2bf182dad41
+SIZE (gitlab-runner/gitlab-runner-10.0.2.tar.bz2) = 2539674
+SHA256 (gitlab-runner/prebuilt-x86_64.tar.xz) = 416a8b6ca55a65f55858fa4b3d9edaf3e272aebe69445ed2f095a12056ff96b4
+SIZE (gitlab-runner/prebuilt-x86_64.tar.xz) = 10449500
+SHA256 (gitlab-runner/prebuilt-arm.tar.xz) = 5e9f67a078486d5370b404561b9b6dff1daa49291d221865150f4b5f31c57787
+SIZE (gitlab-runner/prebuilt-arm.tar.xz) = 8560032