Date: Fri, 23 Apr 2021 19:06:52 GMT From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f56507576be8 - main - www/gitlab-workhorse: Update to 13.11.1. Message-ID: <202104231906.13NJ6qFB043015@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mfechner: URL: https://cgit.FreeBSD.org/ports/commit/?id=f56507576be8d203d512e6e55c40c685f5f50dbd commit f56507576be8d203d512e6e55c40c685f5f50dbd Author: Matthias Fechner <mfechner@FreeBSD.org> AuthorDate: 2021-04-23 14:10:33 +0000 Commit: Matthias Fechner <mfechner@FreeBSD.org> CommitDate: 2021-04-23 19:06:08 +0000 www/gitlab-workhorse: Update to 13.11.1. This update is required for gitlab-ce 13.11. --- www/gitlab-workhorse/Makefile | 14 ++++++++------ www/gitlab-workhorse/distinfo | 20 +++++++++++--------- www/gitlab-workhorse/files/patch-go.mod | 10 ---------- 3 files changed, 19 insertions(+), 25 deletions(-) diff --git a/www/gitlab-workhorse/Makefile b/www/gitlab-workhorse/Makefile index 2b72de95cc7d..1136f3960e31 100644 --- a/www/gitlab-workhorse/Makefile +++ b/www/gitlab-workhorse/Makefile @@ -1,7 +1,7 @@ # Created by: Torsten Zuehlsdorff <tz@FreeBSD.org> PORTNAME?= gitlab-workhorse -PORTVERSION?= 13.10.3 +PORTVERSION?= 13.11.1 PORTREVISION?= 0 CATEGORIES= www @@ -16,18 +16,19 @@ RUN_DEPENDS= p5-Image-ExifTool>=0:graphics/p5-Image-ExifTool USES= gmake go:modules,no_targets MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" +MAKE_ENV+= ${GO_ENV} WRKSRC_SUBDIR= workhorse USE_GITLAB= yes GL_ACCOUNT?= gitlab-org GL_PROJECT= gitlab-foss # Find the commit hash here: https://gitlab.com/gitlab-org/gitlab-foss/-/tags -GL_COMMIT?= b1774ad36a965ba5077db6db11e13f2837284158 +GL_COMMIT?= 2fad41087674984a064cf6a312ac34c16bb2a1aa # for go dependencies USE_GITHUB= nodefault # generated with: make gomod-vendor -# 94dd +# 95dd GH_TUPLE= \ Azure:azure-pipeline-go:v0.2.3:azure_azure_pipeline_go/vendor/github.com/Azure/azure-pipeline-go \ Azure:azure-storage-blob-go:6df5d9af221d:azure_azure_storage_blob_go/vendor/github.com/Azure/azure-storage-blob-go \ @@ -53,7 +54,7 @@ GH_TUPLE= \ dgrijalva:jwt-go:v3.2.0:dgrijalva_jwt_go/vendor/github.com/dgrijalva/jwt-go \ disintegration:imaging:v1.6.2:disintegration_imaging/vendor/github.com/disintegration/imaging \ dlclark:regexp2:v1.2.0:dlclark_regexp2/vendor/github.com/dlclark/regexp2 \ - dominikh:go-tools:v0.0.1-2020.1.5:dominikh_go_tools/vendor/honnef.co/go/tools \ + dominikh:go-tools:v0.1.3:dominikh_go_tools/vendor/honnef.co/go/tools \ form3tech-oss:jwt-go:v3.2.2:form3tech_oss_jwt_go/vendor/github.com/form3tech-oss/jwt-go \ getsentry:raven-go:v0.2.0:getsentry_raven_go/vendor/github.com/getsentry/raven-go \ go-yaml:yaml:9f266ea9e77c:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \ @@ -68,9 +69,9 @@ GH_TUPLE= \ golang:net:6772e930b67b:golang_net/vendor/golang.org/x/net \ golang:oauth2:0b49973bad19:golang_oauth2/vendor/golang.org/x/oauth2 \ golang:protobuf:v1.4.3:golang_protobuf/vendor/github.com/golang/protobuf \ - golang:sys:789bb1bd4061:golang_sys/vendor/golang.org/x/sys \ + golang:sys:b64e53b001e4:golang_sys/vendor/golang.org/x/sys \ golang:text:v0.3.5:golang_text/vendor/golang.org/x/text \ - golang:tools:a1a1cbeaa516:golang_tools/vendor/golang.org/x/tools \ + golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \ golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \ gomodule:redigo:v2.0.0:gomodule_redigo/vendor/github.com/gomodule/redigo \ google:go-cloud:5094f54ed8bb:google_go_cloud/vendor/gocloud.dev \ @@ -87,6 +88,7 @@ GH_TUPLE= \ gorilla:websocket:v1.4.1:gorilla_websocket/vendor/github.com/gorilla/websocket \ grpc-ecosystem:go-grpc-middleware:v1.2.2:grpc_ecosystem_go_grpc_middleware/vendor/github.com/grpc-ecosystem/go-grpc-middleware \ grpc-ecosystem:go-grpc-prometheus:v1.2.0:grpc_ecosystem_go_grpc_prometheus/vendor/github.com/grpc-ecosystem/go-grpc-prometheus \ + grpc:grpc-go:53788aa5dcb4:grpc_grpc_go_1/vendor/google.golang.org/grpc/examples \ grpc:grpc-go:v1.34.1:grpc_grpc_go/vendor/google.golang.org/grpc \ jmespath:go-jmespath:v0.4.0:jmespath_go_jmespath/vendor/github.com/jmespath/go-jmespath \ johannesboyne:gofakes3:02d71f533bec:johannesboyne_gofakes3/vendor/github.com/johannesboyne/gofakes3 \ diff --git a/www/gitlab-workhorse/distinfo b/www/gitlab-workhorse/distinfo index 8a69eee1c6d9..5a9bca1772c5 100644 --- a/www/gitlab-workhorse/distinfo +++ b/www/gitlab-workhorse/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1618479411 +TIMESTAMP = 1619183412 SHA256 (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 99bd58f4a07dd02d9615e3638b3bb6dbfad80ef678ccdb8e17e3fa2b0fef343e SIZE (Azure-azure-pipeline-go-v0.2.3_GH0.tar.gz) = 17102 SHA256 (Azure-azure-storage-blob-go-6df5d9af221d_GH0.tar.gz) = 31047920e4c507f913b9922ad920a2e9f6d48e6056bdc6869b6c257e3ab095a7 @@ -47,8 +47,8 @@ SHA256 (disintegration-imaging-v1.6.2_GH0.tar.gz) = ddc0cbbf306630d39ee710ff055b SIZE (disintegration-imaging-v1.6.2_GH0.tar.gz) = 2212334 SHA256 (dlclark-regexp2-v1.2.0_GH0.tar.gz) = 9b4d25630d0ce86bcd518d79ce47365a84c7c75de2334b2708f1bddcc1df47fe SIZE (dlclark-regexp2-v1.2.0_GH0.tar.gz) = 204926 -SHA256 (dominikh-go-tools-v0.0.1-2020.1.5_GH0.tar.gz) = 28265e6da1fdb3f6fc2fcab984c8c25ed8e6e419d37c81d085c1a407c56f6b7b -SIZE (dominikh-go-tools-v0.0.1-2020.1.5_GH0.tar.gz) = 406267 +SHA256 (dominikh-go-tools-v0.1.3_GH0.tar.gz) = 7eeba9fb52103f11e10a4e84ff585ef192c1504534646293159a2469fe602f21 +SIZE (dominikh-go-tools-v0.1.3_GH0.tar.gz) = 474426 SHA256 (form3tech-oss-jwt-go-v3.2.2_GH0.tar.gz) = 179ca725463e7f13be8591bc285f4048da6887b1056d96848b16e137c995a2e2 SIZE (form3tech-oss-jwt-go-v3.2.2_GH0.tar.gz) = 38248 SHA256 (getsentry-raven-go-v0.2.0_GH0.tar.gz) = 51c75358dca745a76922e1b41a788416a8212839adfbbfc927ea0c0c35122d32 @@ -77,12 +77,12 @@ SHA256 (golang-oauth2-0b49973bad19_GH0.tar.gz) = aa2f3fa36212b76ebd04f8813370e2c SIZE (golang-oauth2-0b49973bad19_GH0.tar.gz) = 64114 SHA256 (golang-protobuf-v1.4.3_GH0.tar.gz) = 5736f943f8647362f5559689df6154f3c85d261fb088867c8a68494e2a767610 SIZE (golang-protobuf-v1.4.3_GH0.tar.gz) = 171969 -SHA256 (golang-sys-789bb1bd4061_GH0.tar.gz) = a04127f73ac83e5a92c42151b0631001ad8d8f7095316008af728ea05997c28e -SIZE (golang-sys-789bb1bd4061_GH0.tar.gz) = 1098336 +SHA256 (golang-sys-b64e53b001e4_GH0.tar.gz) = 4c32d52373df17d9c40604d76e189f274c6fd1386d4d23b9114dbb9805079796 +SIZE (golang-sys-b64e53b001e4_GH0.tar.gz) = 1103798 SHA256 (golang-text-v0.3.5_GH0.tar.gz) = f85d1185ba116cd40ef8cf702fe1d960ed41d039c08fd314dbeb5866f3166f27 SIZE (golang-text-v0.3.5_GH0.tar.gz) = 8348127 -SHA256 (golang-tools-a1a1cbeaa516_GH0.tar.gz) = 676229094a62cbb39c09d5be273d2f83b25ca4d3ea2f0e4990df3aaf7306dae2 -SIZE (golang-tools-a1a1cbeaa516_GH0.tar.gz) = 2646958 +SHA256 (golang-tools-v0.1.0_GH0.tar.gz) = 88f66c1a7ff0f7fce20c0808d2769baa977f56f74197c9681cd864d0977e97a2 +SIZE (golang-tools-v0.1.0_GH0.tar.gz) = 2683055 SHA256 (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 71975d658357e170fd6a41f92539cde8b39c9cd8bfe5931b6311bc5f5c0da0d7 SIZE (golang-xerrors-5ec99f83aff1_GH0.tar.gz) = 13664 SHA256 (gomodule-redigo-v2.0.0_GH0.tar.gz) = b97a9b0298c371c80b4ba141cb683eaa003c8825a5b02526a03435f6e7568289 @@ -115,6 +115,8 @@ SHA256 (grpc-ecosystem-go-grpc-middleware-v1.2.2_GH0.tar.gz) = 58ace93df5406bb6f SIZE (grpc-ecosystem-go-grpc-middleware-v1.2.2_GH0.tar.gz) = 99696 SHA256 (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = eba66530952a126ab869205bdb909af607bfd9eb09f00207b62eb29140258aa9 SIZE (grpc-ecosystem-go-grpc-prometheus-v1.2.0_GH0.tar.gz) = 24760 +SHA256 (grpc-grpc-go-53788aa5dcb4_GH0.tar.gz) = 0f403b90a12e57be00f2a31099a6f01c7598944492e5a82ece3246c9ce0cf6fe +SIZE (grpc-grpc-go-53788aa5dcb4_GH0.tar.gz) = 1161786 SHA256 (grpc-grpc-go-v1.34.1_GH0.tar.gz) = 9fc3756a964e6a36a1fb3efe44700678a1a0b4b23efaf43ababc9f6b8bd44779 SIZE (grpc-grpc-go-v1.34.1_GH0.tar.gz) = 1160355 SHA256 (jmespath-go-jmespath-v0.4.0_GH0.tar.gz) = aa86d00b6836345eee196c13df2df084a18e0b1159935de9289f2ef6a7fe375d @@ -179,8 +181,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137 SIZE (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 164460 SHA256 (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 98901cc41df77858a2f601ad48b45bdf72af40c56f15bc5182416b15db0daac3 SIZE (uber-jaeger-lib-v1.5.0_GH0.tar.gz) = 31655 -SHA256 (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 0a27e1203218d9fc50193632dfbf3cf1bab128edbcd3c875085f4a6c74e9192d -SIZE (gitlab-org-gitlab-foss-b1774ad36a965ba5077db6db11e13f2837284158_GL0.tar.gz) = 100475905 +SHA256 (gitlab-org-gitlab-foss-2fad41087674984a064cf6a312ac34c16bb2a1aa_GL0.tar.gz) = 8d177e531830aeac7a94ac53c92222f796b7a5c7d1a3dd6b8a0baafc5e466e60 +SIZE (gitlab-org-gitlab-foss-2fad41087674984a064cf6a312ac34c16bb2a1aa_GL0.tar.gz) = 96845275 SHA256 (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 000027af9d1bca6db30bb4e0b27fcb4b6315ae7c0787639c044eaa449fc3d8d0 SIZE (gitlab-org-gitaly-3f5e218def93024f3aafe590c22cd1b29f744105_GL0.tar.gz) = 3145584 SHA256 (gitlab-org-labkit-f2d7fb209ecad2eaddb5fb9c4ab03eb8eaa82811_GL0.tar.gz) = 0ac619ab0bfcbda29f80f0955e86c7ffa1adaa20c96ed546f53fb837633f5d90 diff --git a/www/gitlab-workhorse/files/patch-go.mod b/www/gitlab-workhorse/files/patch-go.mod deleted file mode 100644 index 31fe26196f91..000000000000 --- a/www/gitlab-workhorse/files/patch-go.mod +++ /dev/null @@ -1,10 +0,0 @@ ---- go.mod.orig 2021-02-22 17:00:33 UTC -+++ go.mod -@@ -13,6 +13,7 @@ require ( - github.com/golang/gddo v0.0.0-20190419222130-af0f2af80721 - github.com/golang/protobuf v1.4.3 - github.com/gomodule/redigo v2.0.0+incompatible -+ github.com/google/go-cmp v0.3.1 // indirect - github.com/gorilla/websocket v1.4.1 - github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 - github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104231906.13NJ6qFB043015>