Date: Sun, 7 Jul 2019 09:38:04 +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: r506116 - in head/devel/gitaly: . files Message-ID: <201907070938.x679c4qj088451@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Sun Jul 7 09:38:04 2019 New Revision: 506116 URL: https://svnweb.freebsd.org/changeset/ports/506116 Log: Upgrade to 1.47.0 which is required for gitlab-ce 12.0.x. Deleted: head/devel/gitaly/files/patch-bfb7648ed9b54d3c9c095408c117320da6f244dc.diff Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/files/patch-__support_makegen.go head/devel/gitaly/files/patch-config.toml.example head/devel/gitaly/files/patch-ruby_Gemfile head/devel/gitaly/pkg-plist Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Sun Jul 7 09:35:47 2019 (r506115) +++ head/devel/gitaly/Makefile Sun Jul 7 09:38:04 2019 (r506116) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 1.42.5 +DISTVERSION= 1.47.0 PORTREVISION= 0 CATEGORIES= devel @@ -18,7 +18,7 @@ MY_DEPENDS= git>=2.21:devel/git \ rubygem-github-linguist>=6.1:textproc/rubygem-github-linguist \ rubygem-gitlab-markup>=1.7.0:textproc/rubygem-gitlab-markup \ rubygem-activesupport5>=5.1.7:devel/rubygem-activesupport5 \ - rubygem-gitaly-proto>=1.27.0:net/rubygem-gitaly-proto \ + rubygem-gitaly-proto>=1.32.0:net/rubygem-gitaly-proto \ rubygem-rdoc>=6.0:devel/rubygem-rdoc \ rubygem-gitlab-gollum-lib>=4.2.7.7:www/rubygem-gitlab-gollum-lib \ rubygem-gitlab-gollum-rugged_adapter>=0.4.4.2:www/rubygem-gitlab-gollum-rugged_adapter \ @@ -26,24 +26,77 @@ MY_DEPENDS= git>=2.21:devel/git \ rubygem-sentry-raven>=2.9.0:devel/rubygem-sentry-raven \ rubygem-faraday>=0.12:www/rubygem-faraday \ rubygem-rbtrace>0:devel/rubygem-rbtrace \ + rubygem-gitlab-labkit>=0.3.0:devel/rubygem-gitlab-labkit \ rubygem-licensee8>=8.9.0:devel/rubygem-licensee8 \ rubygem-google-protobuf371>=3.7.1:devel/rubygem-google-protobuf371 BUILD_DEPENDS= gem:devel/ruby-gems \ ${MY_DEPENDS} RUN_DEPENDS= ${MY_DEPENDS} \ - gitlab-shell>=6.0.4:devel/gitlab-shell + gitlab-shell>=9.3.0:devel/gitlab-shell -USES= gmake go:no_targets +USES= gmake go:modules,no_targets USE_RUBY= yes +MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" + USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find this here: https://gitlab.com/gitlab-org/gitaly/tags -GL_COMMIT= 49cffe530ac3dccbc168e568f9e7220180817e55 +GL_COMMIT= 333775253533ae4e9e9e66dc12b636821646551f +# for go dependencies +USE_GITHUB= nodefault +# generated with gomod-deps below +GH_TUPLE= \ + BurntSushi:toml:v0.3.1:burntsushi_toml/vendor/github.com/BurntSushi/toml \ + DataDog:dd-trace-go:v1.7.0:datadog_dd_trace_go/vendor/gopkg.in/DataDog/dd-trace-go.v1 \ + beorn7:perks:v1.0.0:beorn7_perks/vendor/github.com/beorn7/perks \ + certifi:gocertifi:ee1a9a0726d2:certifi_gocertifi/vendor/github.com/certifi/gocertifi \ + cloudflare:tableflip:8392f1641731:cloudflare_tableflip/vendor/github.com/cloudflare/tableflip \ + codahale:hdrhistogram:3a0bb77429bd:codahale_hdrhistogram/vendor/github.com/codahale/hdrhistogram \ + davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \ + getsentry:raven-go:v0.1.2:getsentry_raven_go/vendor/github.com/getsentry/raven-go \ + golang:crypto:c2843e01d9a2:golang_crypto/vendor/golang.org/x/crypto \ + golang:net:d8887717615a:golang_net/vendor/golang.org/x/net \ + golang:protobuf:v1.3.1:golang_protobuf/vendor/github.com/golang/protobuf \ + golang:sync:37e7f081c4d4:golang_sync/vendor/golang.org/x/sync \ + golang:sys:d0b11bdaac8a:golang_sys/vendor/golang.org/x/sys \ + golang:text:v0.3.0:golang_text/vendor/golang.org/x/text \ + google:go-genproto:bd91e49a0898:google_go_genproto/vendor/google.golang.org/genproto \ + grpc-ecosystem:go-grpc-middleware:v1.0.0: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:v1.16.0:grpc_grpc_go/vendor/google.golang.org/grpc \ + kelseyhightower:envconfig:v1.3.0:kelseyhightower_envconfig/vendor/github.com/kelseyhightower/envconfig \ + konsorten:go-windows-terminal-sequences:v1.0.1:konsorten_go_windows_terminal_sequences/vendor/github.com/konsorten/go-windows-terminal-sequences \ + libgit2:git2go:ecaeb7a21d47:libgit2_git2go/vendor/github.com/libgit2/git2go \ + lightstep:lightstep-tracer-go:v0.15.6:lightstep_lightstep_tracer_go/vendor/github.com/lightstep/lightstep-tracer-go \ + matttproud:golang_protobuf_extensions:v1.0.1:matttproud_golang_protobuf_extensions/vendor/github.com/matttproud/golang_protobuf_extensions \ + opentracing:opentracing-go:v1.0.2:opentracing_opentracing_go/vendor/github.com/opentracing/opentracing-go \ + philhofer:fwd:v1.0.0:philhofer_fwd/vendor/github.com/philhofer/fwd \ + pkg:errors:v0.8.0:pkg_errors/vendor/github.com/pkg/errors \ + pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \ + prometheus:client_golang:v0.9.3:prometheus_client_golang/vendor/github.com/prometheus/client_golang \ + prometheus:client_model:fd36f4220a90:prometheus_client_model/vendor/github.com/prometheus/client_model \ + prometheus:common:v0.4.0:prometheus_common/vendor/github.com/prometheus/common \ + prometheus:procfs:5867b95ac084:prometheus_procfs/vendor/github.com/prometheus/procfs \ + sirupsen:logrus:v1.2.0:sirupsen_logrus/vendor/github.com/sirupsen/logrus \ + stretchr:testify:v1.2.2:stretchr_testify/vendor/github.com/stretchr/testify \ + tinylib:msgp:v1.1.0:tinylib_msgp/vendor/github.com/tinylib/msgp \ + uber:jaeger-client-go:v2.15.0:uber_jaeger_client_go/vendor/github.com/uber/jaeger-client-go \ + uber:jaeger-lib:v1.5.0:uber_jaeger_lib/vendor/github.com/uber/jaeger-lib +GL_TUPLE= gitlab-org:labkit:0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb:labkit/vendor/gitlab.com/gitlab-org/labkit \ + gitlab-org:gitaly-proto:f4db5d05d437abe1154d7308ca044d3577b5ccba:gitaly_proto/vendor/gitlab.com/gitlab-org/gitaly-proto + + post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/config.toml.example ${MV} ${WRKSRC}/config.toml.example ${WRKSRC}/config.toml.sample + ${CP} ${WRKSRC}/internal/helper/fstype/detect_linux.go ${WRKSRC}/internal/helper/fstype/detect_freebsd.go + +# Build the go deps, use `pkg install modules2tuple` +gomod-deps: patch + (cd ${WRKSRC} && go mod vendor) + (cd ${WRKSRC} && modules2tuple vendor/modules.txt) do-install: ${MKDIR} ${STAGEDIR}${DATADIR} Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Sun Jul 7 09:35:47 2019 (r506115) +++ head/devel/gitaly/distinfo Sun Jul 7 09:38:04 2019 (r506116) @@ -1,3 +1,79 @@ -TIMESTAMP = 1562180603 -SHA256 (gitlab-org-gitaly-49cffe530ac3dccbc168e568f9e7220180817e55_GL0.tar.gz) = 00e5cef916edf0459eca7cca04c716d023dd32c4993e0e1a4e971eca1414e121 -SIZE (gitlab-org-gitaly-49cffe530ac3dccbc168e568f9e7220180817e55_GL0.tar.gz) = 8288039 +TIMESTAMP = 1562482490 +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 +SIZE (DataDog-dd-trace-go-v1.7.0_GH0.tar.gz) = 3321111 +SHA256 (beorn7-perks-v1.0.0_GH0.tar.gz) = b69d92e2e84b7d510dfa6110d3ac4ada0096a6c81190c5e174aa888bfe475cbc +SIZE (beorn7-perks-v1.0.0_GH0.tar.gz) = 10866 +SHA256 (certifi-gocertifi-ee1a9a0726d2_GH0.tar.gz) = b0b9ac422d6378c82be85f71f206757db24ecad314aca6155e9954363817fae1 +SIZE (certifi-gocertifi-ee1a9a0726d2_GH0.tar.gz) = 143846 +SHA256 (cloudflare-tableflip-8392f1641731_GH0.tar.gz) = 0fab510fb61d488f63c59485dadb166d7d5fac5ebbd65e6a3cacfc9fdd1fb6d3 +SIZE (cloudflare-tableflip-8392f1641731_GH0.tar.gz) = 12582 +SHA256 (codahale-hdrhistogram-3a0bb77429bd_GH0.tar.gz) = 3ef6b86658bc370e027304e55a8685767f7fd8a94199f4bea08c9388bf84a1b0 +SIZE (codahale-hdrhistogram-3a0bb77429bd_GH0.tar.gz) = 7738 +SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e +SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152 +SHA256 (getsentry-raven-go-v0.1.2_GH0.tar.gz) = fe603da75a8284273f253a8524d456cd6293fb47508d907f830153ed9af98cb5 +SIZE (getsentry-raven-go-v0.1.2_GH0.tar.gz) = 19314 +SHA256 (golang-crypto-c2843e01d9a2_GH0.tar.gz) = a4d91350f176b2ef99084cd71f990ecee5f549efed72ef59a5b9e425a00d454a +SIZE (golang-crypto-c2843e01d9a2_GH0.tar.gz) = 1650817 +SHA256 (golang-net-d8887717615a_GH0.tar.gz) = 275e6ecfc70b51e05127339c58d0ded3db9b74bf8be869d32c4e731b154af71d +SIZE (golang-net-d8887717615a_GH0.tar.gz) = 974014 +SHA256 (golang-protobuf-v1.3.1_GH0.tar.gz) = 3f3a6123054a9847093c119895f1660612f301fe95358f3a6a1a33fd0933e6cf +SIZE (golang-protobuf-v1.3.1_GH0.tar.gz) = 310884 +SHA256 (golang-sync-37e7f081c4d4_GH0.tar.gz) = d0f0ce92264903fa32032fc365c0c0d36d129fa282d74364c406179a94714f10 +SIZE (golang-sync-37e7f081c4d4_GH0.tar.gz) = 16238 +SHA256 (golang-sys-d0b11bdaac8a_GH0.tar.gz) = e7e3f36dd307e908e59dbda3864ff74f9a5d7f0fdd4d88af630e092beb7d270c +SIZE (golang-sys-d0b11bdaac8a_GH0.tar.gz) = 1243049 +SHA256 (golang-text-v0.3.0_GH0.tar.gz) = 8f4c9a048345befc7beccd09267737ee1f55c7b35e5ff80f344ec9e0aa90febb +SIZE (golang-text-v0.3.0_GH0.tar.gz) = 6102619 +SHA256 (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 659ae77d08446b4bcb7d6b8a9c050d903e6e13fbd903541da7bf9966142e9377 +SIZE (google-go-genproto-bd91e49a0898_GH0.tar.gz) = 2429775 +SHA256 (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = e9178768b55709d2fc2b5a509baceccb4e51d841fa13ed409e16455435e6917b +SIZE (grpc-ecosystem-go-grpc-middleware-v1.0.0_GH0.tar.gz) = 97266 +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-v1.16.0_GH0.tar.gz) = 771230b79dc89753e860b35870ec245b19248b538f0de3fe45d818281739167a +SIZE (grpc-grpc-go-v1.16.0_GH0.tar.gz) = 545087 +SHA256 (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 3556a0d014ba778b78955e8ec9fc320de81509f4aa582ea3b6ce18476c3e40dd +SIZE (kelseyhightower-envconfig-v1.3.0_GH0.tar.gz) = 12408 +SHA256 (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = e36c5a5de388bf72db3037b47f025b09e574be8d0bc74b3e44c960cba0880e87 +SIZE (konsorten-go-windows-terminal-sequences-v1.0.1_GH0.tar.gz) = 1909 +SHA256 (libgit2-git2go-ecaeb7a21d47_GH0.tar.gz) = 2a7cd9579aad7f046795f26c17a92d79f6caded6a512cc37d366a6ae7e28b396 +SIZE (libgit2-git2go-ecaeb7a21d47_GH0.tar.gz) = 72760 +SHA256 (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = b3c3245404b05ea7d030591c1862a807cc0801ce561553b8b7682cb0e198fb14 +SIZE (lightstep-lightstep-tracer-go-v0.15.6_GH0.tar.gz) = 194986 +SHA256 (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 2def0ee6f6b12b1efc0e3007d89f598608a072610e805c3655ea9d13c3ead49b +SIZE (matttproud-golang_protobuf_extensions-v1.0.1_GH0.tar.gz) = 37184 +SHA256 (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = fe3606493ab322c3ae9922b7ebf3e78350665054b0f6142a6ced06eebf1e41df +SIZE (opentracing-opentracing-go-v1.0.2_GH0.tar.gz) = 24067 +SHA256 (philhofer-fwd-v1.0.0_GH0.tar.gz) = 55736f48940198a11b7aeb4faba258459451994a8889ec003ce8d8d26ceca9ff +SIZE (philhofer-fwd-v1.0.0_GH0.tar.gz) = 9221 +SHA256 (pkg-errors-v0.8.0_GH0.tar.gz) = bacf6c58e490911398cee61742ddc6a90c560733e4c9dcb3d867b17a894c9dd5 +SIZE (pkg-errors-v0.8.0_GH0.tar.gz) = 11344 +SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda +SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398 +SHA256 (prometheus-client_golang-v0.9.3_GH0.tar.gz) = 691646522cee404fc8d48bf830309bb75e7b36ceca31d8dc2febe142e66a9ca8 +SIZE (prometheus-client_golang-v0.9.3_GH0.tar.gz) = 138415 +SHA256 (prometheus-client_model-fd36f4220a90_GH0.tar.gz) = 17571c708bab9a1ba18d9dd0c9bfe96dff3f1b84c63e7d8d4c3489ef5c34ee40 +SIZE (prometheus-client_model-fd36f4220a90_GH0.tar.gz) = 57491 +SHA256 (prometheus-common-v0.4.0_GH0.tar.gz) = 5fbad5f7332e40e1e1a75da389e81cf51300c26efff8dfe894eb814d2db5062e +SIZE (prometheus-common-v0.4.0_GH0.tar.gz) = 98312 +SHA256 (prometheus-procfs-5867b95ac084_GH0.tar.gz) = e7a790683185905621d3ea93fc605a38957b3a5e4a16ff90dee557d2e714c842 +SIZE (prometheus-procfs-5867b95ac084_GH0.tar.gz) = 72672 +SHA256 (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 679aa05d23ca81b74f1327e7a25267a322dc9fd807a276e73e781f62ee679c6d +SIZE (sirupsen-logrus-v1.2.0_GH0.tar.gz) = 37794 +SHA256 (stretchr-testify-v1.2.2_GH0.tar.gz) = 0728bb470254e8b39deae3e6c1c92a98e737239ae0be484188fb9083250adf5f +SIZE (stretchr-testify-v1.2.2_GH0.tar.gz) = 101698 +SHA256 (tinylib-msgp-v1.1.0_GH0.tar.gz) = 30ac583b725d84aee147c26d1bc31e8770a3911e8437461cda0e53fb69c54570 +SIZE (tinylib-msgp-v1.1.0_GH0.tar.gz) = 77923 +SHA256 (uber-jaeger-client-go-v2.15.0_GH0.tar.gz) = 6b89d1a6684475fcbaed3f9d2137df072e2c1f7b15feb69a8ef8963804c44c94 +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-333775253533ae4e9e9e66dc12b636821646551f_GL0.tar.gz) = a3eb4087178fcc151a0b7545f8708c0484886bd1e2b02eafc9c7d6ccf24142d4 +SIZE (gitlab-org-gitaly-333775253533ae4e9e9e66dc12b636821646551f_GL0.tar.gz) = 2061778 +SHA256 (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 449f2e2d1cedea1ea276a1d8132d0244a4c5ffc465d2a24b824ab9790641f78e +SIZE (gitlab-org-labkit-0c3fc7cdd57c57da5ab474aa72b6640d2bdc9ebb_GL0.tar.gz) = 2280466 +SHA256 (gitlab-org-gitaly-proto-f4db5d05d437abe1154d7308ca044d3577b5ccba_GL0.tar.gz) = 5f716dae8d3085eeff97bb1df5d8078c7194b589e63a442126eebcf8c56c64a2 +SIZE (gitlab-org-gitaly-proto-f4db5d05d437abe1154d7308ca044d3577b5ccba_GL0.tar.gz) = 177233 Modified: head/devel/gitaly/files/patch-__support_makegen.go ============================================================================== --- head/devel/gitaly/files/patch-__support_makegen.go Sun Jul 7 09:35:47 2019 (r506115) +++ head/devel/gitaly/files/patch-__support_makegen.go Sun Jul 7 09:38:04 2019 (r506116) @@ -1,7 +1,7 @@ ---- _support/makegen.go.orig 2019-04-05 16:17:09 UTC +--- _support/makegen.go.orig 2019-06-18 09:53:31 UTC +++ _support/makegen.go -@@ -253,7 +253,7 @@ var templateText = ` - # These variables may be overriden at runtime by top-level make +@@ -282,7 +282,7 @@ var templateText = ` + # These variables may be overridden at runtime by top-level make PREFIX ?= /usr/local INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/ -BUNDLE_FLAGS ?= --deployment @@ -9,7 +9,7 @@ ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly BUILD_TAGS := tracer_static tracer_static_jaeger -@@ -274,8 +274,8 @@ build: ../.ruby-bundle +@@ -330,8 +330,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 Sun Jul 7 09:35:47 2019 (r506115) +++ head/devel/gitaly/files/patch-config.toml.example Sun Jul 7 09:38:04 2019 (r506116) @@ -1,4 +1,4 @@ ---- config.toml.example.orig 2018-12-10 17:27:53 UTC +--- config.toml.example.orig 2019-06-18 09:53:31 UTC +++ config.toml.example @@ -1,9 +1,9 @@ # Example Gitaly configuration file @@ -12,14 +12,15 @@ # # Optional: listen on a TCP socket. This is insecure (no authentication) # listen_addr = "localhost:9999" -@@ -22,12 +22,12 @@ bin_dir = "/home/git/gitaly" +@@ -22,13 +22,13 @@ bin_dir = "/home/git/gitaly" # key_path = '/home/git/key.pem' - # # Git executable settings + # # Git settings -# [git] -# bin_path = "/usr/bin/git" +[git] +bin_path = "%%PREFIX%%/bin/git" + # catfile_cache_size = 100 [[storage]] name = "default" @@ -28,7 +29,7 @@ # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -55,7 +55,7 @@ path = "/home/git/repositories" +@@ -56,7 +56,7 @@ path = "/home/git/repositories" [gitaly-ruby] # The directory where gitaly-ruby is installed @@ -37,7 +38,7 @@ # # Gitaly-ruby resident set size (RSS) that triggers a memory restart (bytes) # max_rss = 200000000 -@@ -71,7 +71,7 @@ dir = "/home/git/gitaly/ruby" +@@ -72,7 +72,7 @@ dir = "/home/git/gitaly/ruby" [gitlab-shell] # The directory where gitlab-shell is installed Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Sun Jul 7 09:35:47 2019 (r506115) +++ head/devel/gitaly/files/patch-ruby_Gemfile Sun Jul 7 09:38:04 2019 (r506116) @@ -1,20 +1,20 @@ ---- ruby/Gemfile.orig 2019-05-06 14:54:47 UTC +--- ruby/Gemfile.orig 2019-06-18 09:53:31 UTC +++ ruby/Gemfile @@ -8,7 +8,7 @@ gem 'github-linguist', '~> 6.1', require: 'linguist' gem 'gitlab-markup', '~> 1.7.0' gem 'activesupport', '~> 5.1.7' - gem 'gitaly-proto', '~> 1.27.0' + gem 'gitaly-proto', '~> 1.32.0' -gem 'rdoc', '~> 4.2' +gem 'rdoc', '~> 6.0' gem 'gitlab-gollum-lib', '~> 4.2.7.7', require: false gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false gem 'grpc', '~> 1.19.0' -@@ -22,17 +22,3 @@ gem 'licensee', '~> 8.9.0' +@@ -25,17 +25,3 @@ gem 'licensee', '~> 8.9.0' gem 'google-protobuf', '~> 3.7.1' -group :development, :test do -- gem 'rubocop', '~> 0.68', require: false +- gem 'rubocop', '~> 0.69', require: false - gem 'rspec', require: false - gem 'rspec-parameterized', require: false - gem 'timecop', require: false Modified: head/devel/gitaly/pkg-plist ============================================================================== --- head/devel/gitaly/pkg-plist Sun Jul 7 09:35:47 2019 (r506115) +++ head/devel/gitaly/pkg-plist Sun Jul 7 09:38:04 2019 (r506116) @@ -111,7 +111,6 @@ %%DATADIR%%/ruby/lib/gitlab/git/conflict/parser.rb %%DATADIR%%/ruby/lib/gitlab/git/conflict/resolution.rb %%DATADIR%%/ruby/lib/gitlab/git/conflict/resolver.rb -%%DATADIR%%/ruby/lib/gitlab/git/diff.rb %%DATADIR%%/ruby/lib/gitlab/git/gitaly_remote_repository.rb %%DATADIR%%/ruby/lib/gitlab/git/gitlab_projects.rb %%DATADIR%%/ruby/lib/gitlab/git/hook.rb @@ -157,7 +156,6 @@ %%DATADIR%%/ruby/spec/lib/gitlab/git/branch_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/commit_patches_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/commit_spec.rb -%%DATADIR%%/ruby/spec/lib/gitlab/git/diff_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/gitlab_projects_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/hook_spec.rb %%DATADIR%%/ruby/spec/lib/gitlab/git/index_spec.rb
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907070938.x679c4qj088451>