Date: Mon, 22 Jun 2020 18:32:52 +0000 (UTC) From: Matthias Fechner <mfechner@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r539897 - in head/devel/gitaly: . files Message-ID: <202006221832.05MIWqWr038700@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Mon Jun 22 18:32:51 2020 New Revision: 539897 URL: https://svnweb.freebsd.org/changeset/ports/539897 Log: Update to 13.1.0 which is required for gitlab-ce 13.1 upgrade. Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/files/patch-__support_Makefile.template head/devel/gitaly/files/patch-config.toml.example Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Mon Jun 22 18:31:59 2020 (r539896) +++ head/devel/gitaly/Makefile Mon Jun 22 18:32:51 2020 (r539897) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 13.0.6 +DISTVERSION= 13.1.0 PORTREVISION= 0 CATEGORIES= devel @@ -42,7 +42,7 @@ MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags -GL_COMMIT= 33042dd28f60ef06697c6fbadd8c53cb9d3536d2 +GL_COMMIT= 9f05d83e129c2e0ded32b9c3441c576905b873ab # for go dependencies USE_GITHUB= nodefault Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Mon Jun 22 18:31:59 2020 (r539896) +++ head/devel/gitaly/distinfo Mon Jun 22 18:32:51 2020 (r539897) @@ -1,4 +1,4 @@ -TIMESTAMP = 1591859804 +TIMESTAMP = 1592635319 SHA256 (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 6593da894578ba510a470735ffbdc88ce88033094dc5a8f4d3957ab87e18803f SIZE (BurntSushi-toml-v0.3.1_GH0.tar.gz) = 42077 SHA256 (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = d81bd47683ef9cbd228691b077373d3e15ca5fa5b9e7919099c4e87779040e84 @@ -99,8 +99,8 @@ SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b 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-gitaly-33042dd28f60ef06697c6fbadd8c53cb9d3536d2_GL0.tar.gz) = e09ecfcda45720709a88c78718d7cccb207f05984a1e83d5639e5fcb66a3fe42 -SIZE (gitlab-org-gitaly-33042dd28f60ef06697c6fbadd8c53cb9d3536d2_GL0.tar.gz) = 3007790 +SHA256 (gitlab-org-gitaly-9f05d83e129c2e0ded32b9c3441c576905b873ab_GL0.tar.gz) = 8aae9cd87692e9c13c83889be293bcd9fdbc5f43039687f2683c532ac9cb3cc6 +SIZE (gitlab-org-gitaly-9f05d83e129c2e0ded32b9c3441c576905b873ab_GL0.tar.gz) = 3022387 SHA256 (gitlab-org-gitlab-shell-716e30c55e893ebe2385b27f85902a789f26c6ef_GL0.tar.gz) = 9a2a40a6c44802b1de7ff46bc9c6bc97c8be179d0ca4fe755c22044650d3f84c SIZE (gitlab-org-gitlab-shell-716e30c55e893ebe2385b27f85902a789f26c6ef_GL0.tar.gz) = 65840 SHA256 (gitlab-org-labkit-0149780c759d60f61fcfe1648fb882ba7ec41f3f_GL0.tar.gz) = fa3a9e6a6da58375427ee1814d95dba8d55bee13537492bba19480eae772ab95 Modified: head/devel/gitaly/files/patch-__support_Makefile.template ============================================================================== --- head/devel/gitaly/files/patch-__support_Makefile.template Mon Jun 22 18:31:59 2020 (r539896) +++ head/devel/gitaly/files/patch-__support_Makefile.template Mon Jun 22 18:32:51 2020 (r539897) @@ -1,6 +1,6 @@ ---- _support/Makefile.template.orig 2020-05-21 17:02:13 UTC +--- _support/Makefile.template.orig 2020-06-19 15:55:37 UTC +++ _support/Makefile.template -@@ -43,8 +43,8 @@ build: ../.ruby-bundle +@@ -44,8 +44,8 @@ build: ../.ruby-bundle # step. Both Omnibus and CNG assume it is in the Gitaly root, not in # _build. Hence the '../' in front. ../.ruby-bundle: {{ .GitalyRubyDir }}/Gemfile.lock {{ .GitalyRubyDir }}/Gemfile Modified: head/devel/gitaly/files/patch-config.toml.example ============================================================================== --- head/devel/gitaly/files/patch-config.toml.example Mon Jun 22 18:31:59 2020 (r539896) +++ head/devel/gitaly/files/patch-config.toml.example Mon Jun 22 18:32:51 2020 (r539897) @@ -1,4 +1,4 @@ ---- config.toml.example.orig 2020-05-21 17:02:13 UTC +--- config.toml.example.orig 2020-06-19 15:55:37 UTC +++ config.toml.example @@ -2,10 +2,10 @@ # Documentation lives at https://docs.gitlab.com/ee/administration/gitaly/ and @@ -26,7 +26,7 @@ [[storage]] name = "default" -path = "/home/git/repositories" -+path = "/usr/local/git/repositories" ++path = "%%PREFIX%%/git/repositories" # # You can optionally configure more storages for this Gitaly instance to serve up # @@ -48,18 +48,22 @@ # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 200000000 -@@ -85,10 +85,10 @@ dir = "/home/git/gitaly/ruby" +@@ -85,14 +85,14 @@ dir = "/home/git/gitaly/ruby" [gitlab-shell] # The directory where gitlab-shell is installed -dir = "/home/git/gitlab-shell" --secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" --custom_hooks_dir = "/home/git/custom_hooks" --gitlab_url = "http://localhost:8080" +dir = "%%PREFIX%%/share/gitlab-shell" -+secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret" + + [hooks] +-custom_hooks_dir = "/home/git/custom_hooks" +custom_hooks_dir = "%%PREFIX%%/git/custom_hooks" -+gitlab_url = "https://_change_to_gitlab_url_" - [gitlab-shell.http-settings] + [gitlab] +-secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret" +-url = "http+unix://%2Fhome%2Fgit%2Fgitlab%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" ++secret_file = "%%PREFIX%%/share/gitlab-shell/.gitlab_shell_secret" ++url = "http+unix://%2Fusr%2Flocal%2Fwww%2Fgitlab-ce%2Ftmp%2Fsockets%2Fgitlab-workhorse.socket" + + [gitlab.http-settings] # read_timeout = 300
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202006221832.05MIWqWr038700>