git: 8b344cff4b7c - main - devel/gitlab-runner: update to 18.0.0

From: Matthias Fechner <mfechner_at_FreeBSD.org>
Date: Mon, 19 May 2025 13:36:19 UTC
The branch main has been updated by mfechner:

URL: https://cgit.FreeBSD.org/ports/commit/?id=8b344cff4b7c23019635a2c78f9b4c11715132ce

commit 8b344cff4b7c23019635a2c78f9b4c11715132ce
Author:     Matthias Fechner <mfechner@FreeBSD.org>
AuthorDate: 2025-05-19 11:41:11 +0000
Commit:     Matthias Fechner <mfechner@FreeBSD.org>
CommitDate: 2025-05-19 13:35:49 +0000

    devel/gitlab-runner: update to 18.0.0
    
    In this version I patched out a replace instruction in go.mod to work-around
    a build problem with the port in FreeBSD.
    After it is working fine, I will try to address that solution here:
    https://gitlab.com/gitlab-org/gitlab-runner/-/issues/38761
    
    Changes:        https://gitlab.com/gitlab-org/gitlab-runner/-/blob/main/CHANGELOG.md
---
 devel/gitlab-runner/Makefile | 13 ++++++++-----
 devel/gitlab-runner/distinfo | 20 +++++++++++---------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/devel/gitlab-runner/Makefile b/devel/gitlab-runner/Makefile
index f4706a4c2bf5..14a068a9d861 100644
--- a/devel/gitlab-runner/Makefile
+++ b/devel/gitlab-runner/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	gitlab-runner
 DISTVERSIONPREFIX=	v
-DISTVERSION=	17.9.0
-PORTREVISION=	2
+DISTVERSION=	18.0.0
 CATEGORIES=	devel
 MASTER_SITES=	https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerx64 \
 		https://gitlab-runner-downloads.s3.amazonaws.com/master/docker/:dockerarm
@@ -10,6 +9,8 @@ DISTFILES=	prebuilt-x86_64.tar.xz:dockerx64 \
 
 #PATCH_SITES=	https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/
 #PATCHFILES+=	4551.patch:-p1 # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4551, Allow FreeBSD to be used with Docker builds
+#PATCH_SITES=	https://gitlab.com/mfechner/gitlab-runner/-/commit/
+#PATCHFILES+=	2f12af03ccd5fe875d583ddc8b976329b635fd22.patch:-p1
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Official GitLab Runner written in Go
@@ -27,8 +28,10 @@ USES=		go:modules,1.23
 USE_GITLAB=	yes
 GL_ACCOUNT=	gitlab-org
 USE_RC_SUBR=	gitlab_runner
+# this branch removes the replace line in go.mod which breaks the way FreeBSD ports build go packages
+GO_MOD_DIST=	https://gitlab.com/mfechner/gitlab-runner/-/raw/18-0-stable/
 
-GITBRANCH=	17-9-stable
+GITBRANCH=	18-0-stable
 GO_MODULE=	gitlab.com/gitlab-org/gitlab-runner
 
 _BUILD_DATE=	$$(date -u +%Y-%m-%dT%H:%M:%S%z)
@@ -45,8 +48,8 @@ GO_BUILDFLAGS= -ldflags=" \
 # so we download the required go.mod file from gitlab
 # lines are taken from go.mk
 # ---------------------------
-MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-runner/-/raw/v${DISTVERSION}/
-DISTFILES+=	go.mod
+#MASTER_SITES+=	https://gitlab.com/gitlab-org/gitlab-runner/-/raw/v${DISTVERSION}/
+#DISTFILES+=	go.mod
 EXTRACT_ONLY+=	${DISTFILES:N*.mod\:*:N*.mod:C/:.*//:Nprebuilt*:}
 # ---------------------------
 
diff --git a/devel/gitlab-runner/distinfo b/devel/gitlab-runner/distinfo
index 9e9f7ad0cae7..03b25a4d4a48 100644
--- a/devel/gitlab-runner/distinfo
+++ b/devel/gitlab-runner/distinfo
@@ -1,9 +1,11 @@
-TIMESTAMP = 1740563047
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v17.9.0/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
-SIZE (go/devel_gitlab-runner/gitlab-runner-v17.9.0/prebuilt-x86_64.tar.xz) = 9594352
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v17.9.0/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
-SIZE (go/devel_gitlab-runner/gitlab-runner-v17.9.0/prebuilt-arm.tar.xz) = 9020896
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v17.9.0/go.mod) = 8af1f0b0556c15751e5e8ff8b6fdf45de3184fd94ab8928e89af8ec4ca7c4b3a
-SIZE (go/devel_gitlab-runner/gitlab-runner-v17.9.0/go.mod) = 13172
-SHA256 (go/devel_gitlab-runner/gitlab-runner-v17.9.0/gitlab-runner-v17.9.0.tar.bz2) = 83405d222f7c43057ff0e78a18020572ae8cdd1a7bfdc293134fef833cdc3e59
-SIZE (go/devel_gitlab-runner/gitlab-runner-v17.9.0/gitlab-runner-v17.9.0.tar.bz2) = 1782573
+TIMESTAMP = 1747639300
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.0.0/prebuilt-x86_64.tar.xz) = b0dccc53f415962dde3f5a7e6f1ab068b8da5484a7fefdae2c5e39d8bb6c637e
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.0.0/prebuilt-x86_64.tar.xz) = 9594352
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.0.0/prebuilt-arm.tar.xz) = 5018c6b661ebf4b9c661593548e45394c553bbd4082b5ef744a39a1f7f1fee32
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.0.0/prebuilt-arm.tar.xz) = 9020896
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.0.0/go.mod) = 4a31cea8681a41ee85d8b305a5ebd6513a8c8cc65c194e98344ed5438c3b7163
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.0.0/go.mod) = 13091
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.0.0/gitlab-runner-v18.0.0.tar.bz2) = a57d75307f98c45669d6e705d77d1bc638139ccecde97760905ae24ac0ca67f0
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.0.0/gitlab-runner-v18.0.0.tar.bz2) = 1942798
+SHA256 (go/devel_gitlab-runner/gitlab-runner-v18.0.0/2f12af03ccd5fe875d583ddc8b976329b635fd22.patch) = 806793b4cac531f516132c3ee4f4bcdfd39491ddac2ec61157dbda28c073ac94
+SIZE (go/devel_gitlab-runner/gitlab-runner-v18.0.0/2f12af03ccd5fe875d583ddc8b976329b635fd22.patch) = 1281