Date: Tue, 25 Aug 2020 13:01:30 +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: r546168 - in head/devel/gitaly: . files Message-ID: <202008251301.07PD1U52036336@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mfechner Date: Tue Aug 25 13:01:30 2020 New Revision: 546168 URL: https://svnweb.freebsd.org/changeset/ports/546168 Log: Upgrade to 13.3.0 which is required for gitlab 13.3. Deleted: head/devel/gitaly/files/patch-mr2407 Modified: head/devel/gitaly/Makefile head/devel/gitaly/distinfo head/devel/gitaly/files/patch-Makefile head/devel/gitaly/files/patch-ruby_Gemfile Modified: head/devel/gitaly/Makefile ============================================================================== --- head/devel/gitaly/Makefile Tue Aug 25 13:01:09 2020 (r546167) +++ head/devel/gitaly/Makefile Tue Aug 25 13:01:30 2020 (r546168) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= gitaly -DISTVERSION= 13.2.3 +DISTVERSION= 13.3.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= 17d5289ef05d4c217513a90ca6d8b01ab24473d5 +GL_COMMIT= acbb9772e864cae2e0a8f6b015a75e1ee7199de6 # for go dependencies USE_GITHUB= nodefault Modified: head/devel/gitaly/distinfo ============================================================================== --- head/devel/gitaly/distinfo Tue Aug 25 13:01:09 2020 (r546167) +++ head/devel/gitaly/distinfo Tue Aug 25 13:01:30 2020 (r546168) @@ -1,4 +1,4 @@ -TIMESTAMP = 1596696739 +TIMESTAMP = 1598284290 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-17d5289ef05d4c217513a90ca6d8b01ab24473d5_GL0.tar.gz) = 2c7de093ba40a04585f65b79a1a9f724f892cf4580a35db0abdb9b5a0173f464 -SIZE (gitlab-org-gitaly-17d5289ef05d4c217513a90ca6d8b01ab24473d5_GL0.tar.gz) = 3063085 +SHA256 (gitlab-org-gitaly-acbb9772e864cae2e0a8f6b015a75e1ee7199de6_GL0.tar.gz) = 5fca740be1fb0e1c325630b40cba55aae6de321890dd25935714cff67c891c8a +SIZE (gitlab-org-gitaly-acbb9772e864cae2e0a8f6b015a75e1ee7199de6_GL0.tar.gz) = 3098698 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-Makefile ============================================================================== --- head/devel/gitaly/files/patch-Makefile Tue Aug 25 13:01:09 2020 (r546167) +++ head/devel/gitaly/files/patch-Makefile Tue Aug 25 13:01:30 2020 (r546168) @@ -1,4 +1,4 @@ ---- Makefile.orig 2020-07-22 11:23:09 UTC +--- Makefile.orig 2020-08-21 11:51:41 UTC +++ Makefile @@ -44,7 +44,7 @@ PROTOC_GEN_GITALY := ${BUILD_DIR}/bin/protoc-gen-gital GO_JUNIT_REPORT := ${BUILD_DIR}/bin/go-junit-report @@ -9,7 +9,7 @@ GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly BUILD_TIME := $(shell date +"%Y%m%d.%H%M%S") GITALY_VERSION := $(shell git describe --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown) -@@ -317,8 +317,7 @@ build-git: +@@ -316,8 +316,7 @@ build-git: # step. Both Omnibus and CNG assume it is in the Gitaly root, not in # _build. Hence the '../' in front. ${SOURCE_DIR}/.ruby-bundle: ${GITALY_RUBY_DIR}/Gemfile.lock ${GITALY_RUBY_DIR}/Gemfile Modified: head/devel/gitaly/files/patch-ruby_Gemfile ============================================================================== --- head/devel/gitaly/files/patch-ruby_Gemfile Tue Aug 25 13:01:09 2020 (r546167) +++ head/devel/gitaly/files/patch-ruby_Gemfile Tue Aug 25 13:01:30 2020 (r546168) @@ -1,6 +1,6 @@ ---- ruby/Gemfile.orig 2020-05-21 17:02:13 UTC +--- ruby/Gemfile.orig 2020-08-21 11:51:41 UTC +++ ruby/Gemfile -@@ -3,7 +3,7 @@ source 'https://rubygems.org' +@@ -3,14 +3,14 @@ source 'https://rubygems.org' # Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 gem 'bundler', '>= 1.17.3' @@ -9,9 +9,20 @@ gem 'github-linguist', '~> 7.9', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' gem 'activesupport', '~> 6.0.3.1' -@@ -24,19 +24,3 @@ gem 'licensee', '~> 8.9.0' + gem 'rdoc', '~> 6.0' + gem 'gitlab-gollum-lib', '~> 4.2.7.9', require: false + gem 'gitlab-gollum-rugged_adapter', '~> 0.4.4.2', require: false +-gem 'grpc', '~> 1.30.2' ++gem 'grpc', '~> 1.24.0' + gem 'sentry-raven', '~> 2.9.0', require: false + gem 'faraday', '~> 0.12' + gem 'rbtrace', require: false +@@ -22,21 +22,5 @@ gem 'gitlab-labkit', '~> 0.12.0' + # This version needs to be in sync with GitLab CE/EE + gem 'licensee', '~> 8.9.0' - gem 'google-protobuf', '~> 3.8.0' +-gem 'google-protobuf', '~> 3.12' ++gem 'google-protobuf', '~> 3.8.0' -group :development, :test do - gem 'rubocop', '~> 0.69', require: false @@ -21,7 +32,7 @@ - gem 'factory_bot', require: false - gem 'pry', '~> 0.12.2', require: false - -- gem 'grpc-tools', '= 1.0.1' +- gem 'grpc-tools', '= 1.30.2' - - # gitlab-shell spec gems - gem 'listen', '~> 0.5.0'
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008251301.07PD1U52036336>