svn commit: r491371 - head/devel/gitlab-runner

[Tobias Kortkamp]

On Sun, Jan 27, 2019 at 05:36:11PM +0000, Steve Wills wrote:
> Author: swills
> Date: Sun Jan 27 17:36:11 2019
> New Revision: 491371
> URL: https://svnweb.freebsd.org/changeset/ports/491371
> 
> Log:
>   devel/gitlab-runner: update to 11.7.0
> 
> Modified:
>   head/devel/gitlab-runner/Makefile   (contents, props changed)
>   head/devel/gitlab-runner/distinfo   (contents, props changed)
> 
> Modified: head/devel/gitlab-runner/Makefile
> ==============================================================================
> --- head/devel/gitlab-runner/Makefile	Sun Jan 27 17:03:46 2019	(r491370)
> +++ head/devel/gitlab-runner/Makefile	Sun Jan 27 17:36:11 2019	(r491371)
> @@ -1,7 +1,7 @@
>  # $FreeBSD$
>  
>  PORTNAME=	gitlab-runner
> -PORTVERSION=	11.6.1
> +PORTVERSION=	11.7.0
>  CATEGORIES=	devel
>  MASTER_SITES=	\
>  		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \
> @@ -26,9 +26,10 @@ RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss \
>  
>  USE_GITLAB=	yes
>  GL_ACCOUNT=	gitlab-org
> -GL_COMMIT=	8d8299751972f769b55288d36a354139bdb7dcfe
> +GL_COMMIT=	8bb608ff3a677132022502b07dae8a3ea679f3d1
>  GITREV=		8d829975
> -GITBRANCH=	11-6-stable
> +GITREV=		8bb608ff
> +GITBRANCH=	11-7-stable

Hi,

GITREV is now set twice.  Maybe we can avoid even setting it with
something like this?

Index: Makefile
===================================================================
--- Makefile	(revision 491460)
+++ Makefile	(working copy)
@@ -27,13 +27,11 @@
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 GL_COMMIT=	8bb608ff3a677132022502b07dae8a3ea679f3d1
-GITREV=		8d829975
-GITREV=		8bb608ff
 GITBRANCH=	11-7-stable
 BUILT=		2019-01-15T15:24:23+0000
 
 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.REVISION=${GL_COMMIT:C/^(........).*/\1/} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.BUILT=${BUILT} \
 		-X gitlab.com/gitlab-org/gitlab-runner/common.BRANCH=${GITBRANCH} \
 		-s -w

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 618 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-all/attachments/20190128/4c70df7a/attachment.sig>