Navigation Menu

Skip to content

Commit

Permalink
devel/gitaly: update to 14.10.0
Browse files Browse the repository at this point in the history 
Required for gitlab-ce 14.10.
Changelog:
https://gitlab.com/gitlab-org/gitaly/-/blob/master/CHANGELOG.md

14.10.0 (2022-04-21)

Added (9 changes)

Wire metadata verifier in Praefect's main (merge request)

Initial implementation of a metadata verifier (merge request)

Include rate limiter as a middleware in Gitaly (merge request)

commit: Add CheckObjectsExist RPC (merge request)

config: Add RateLimiting configuration (merge request)

Allow Commit.RawBlame to take a Range parameter (merge request)

repository: Use Size() to calculate repo size behind feature flag (merge request)

command: Log cgroup path (merge request)

gitaly/config: Introduce runtime directory configuration (merge request)

Fixed (6 changes)

ssh: Clean up output when pre-receive hook fails (merge request)

Handle DeleteObjectPool calls in Praefect (merge request)

Makefile: Fix performance issues caused by tracing in binaries (merge request)

Makefile: Fix indeterministic sorting order of Git patches (merge request)

cgroups: Allow stats to be collected in absence of memsw.* entries (merge request)

operations: Fix missing votes on squashed commits (merge request)

Changed (22 changes)

Expose last verification time in 'praefect metadata' (merge request)

Expose VerifiedAt via GetRepositoryMetadata proto definitions (merge request)

featureflag: Remove TransactionalSymbolicRefUpdates featureflag (merge request)

limithandler: Change metric name for concurrency limiting (merge request)

Remove implicit pool creation on link behavior (merge request)

Makefile: Upgrade the default Git distribution to v2.35.1.gl1 (merge request)

git: Remove feature flag for Git v2.35.1.gl1 (merge request)

featureflag: Enable TransactionalSymbolicRefUpdates by default (merge request)

proto: Mark related RPCs as maintenance operations (merge request)

praefect: Implement routing for maintenance operations (merge request)

housekeeping: Skip repacking empty repositories (merge request)

operations: Default-enable quarantined voting for UserSquash (merge request)

git: Enable bundled Git v2.35.1.gl1 by default (merge request)

maintenance: Call housekeeping manager's OptimizeRepository directly (merge request)

sidechannel: Convert to use runtime directory to store sockets (merge request)

git: Remove feature flag for bundled Git (merge request)

repository: Structured errors for UserRebaseConfirmable (merge request)

git: Migrate Git exec path to use runtime directory (merge request)

git: Migrate hook directory to use runtime directory (merge request)

gitaly/config: Migrate internal sockets to use runtime directory (merge request)

operations: Always use structured errors for UserSquash (merge request)

housekeeping: Limit concurrency of OptimizeRepository to 1 (merge request)

Performance (9 changes)

housekeeping: Avoid stat calls when searching for locked refs (merge request)

housekeeping: Avoid stat calls when searching for broken refs (merge request)

housekeeping: Avoid stat calls when searching for temporary objects (merge request)

middleware/cache: Handle maintenance-style RPCs (merge request)

git: Limit number of threads in git-grep(1) (merge request)

git: Globally limit threads used by git-pack-objects(1) (merge request)

housekeeping: Skip prune if there are no old objects (merge request)

housekeeping: Clean up server info data (merge request)

git: Disable generation of server info in git-repack(1) (merge request)

Other (2 changes)

Add migrations for background verification schema (merge request)

sidechannel: use default yamux max window size (merge request)

MFH:		2022Q2
  • Loading branch information
@mfechner
mfechner committed Apr 22, 2022
1 parent fe121ee commit b64a8ac
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
10 changes: 5 additions & 5 deletions devel/gitaly/Makefile
View file
@@ -1,6 +1,6 @@
PORTNAME= gitaly
DISTVERSION= 14.9.3
PORTREVISION= 1
DISTVERSION= 14.10.0
PORTREVISION= 0
CATEGORIES= devel

MAINTAINER= mfechner@FreeBSD.org
Expand All @@ -19,7 +19,7 @@ MY_DEPENDS= git>=2.35.1:devel/git \
rubygem-rugged>=1.2<2:devel/rubygem-rugged \
rubygem-github-linguist>=7.12.1<8:textproc/rubygem-github-linguist \
rubygem-gitlab-markup>=1.8.0<1.9.0:textproc/rubygem-gitlab-markup \
rubygem-activesupport61>=6.1.4.6<6.1.5:devel/rubygem-activesupport61 \
rubygem-activesupport61>=6.1.4.7<6.1.5:devel/rubygem-activesupport61 \
rubygem-rdoc>=6.3.2<7.0:devel/rubygem-rdoc \
rubygem-gitlab-gollum-lib>=4.2.7.10.gitlab.2<4.2.8:www/rubygem-gitlab-gollum-lib \
rubygem-gitlab-gollum-rugged_adapter>=0.4.4.4.gitlab.1<0.4.5.0:www/rubygem-gitlab-gollum-rugged_adapter \
Expand Down Expand Up @@ -49,7 +49,7 @@ MAKE_ENV+= ${GO_ENV}
USE_GITLAB= yes
GL_ACCOUNT= gitlab-org
# Find this here: https://gitlab.com/gitlab-org/gitaly/-/tags
GL_COMMIT= b17cdf96c4a7ec7a81b44fd5ffdb964c596d7fcd
GL_COMMIT= 1478932866d068186c3a8af85fa11e5a97f5558e

# for go dependencies
USE_GITHUB= nodefault
Expand Down Expand Up @@ -115,7 +115,7 @@ GH_TUPLE= \
golang:sync:036812b2e83c:golang_sync/vendor/golang.org/x/sync \
golang:sys:4dd72447c267:golang_sys/vendor/golang.org/x/sys \
golang:text:v0.3.6:golang_text/vendor/golang.org/x/text \
golang:time:f8bda1e9f3ba:golang_time/vendor/golang.org/x/time \
golang:time:0e9765cccd65:golang_time/vendor/golang.org/x/time \
golang:tools:v0.1.0:golang_tools/vendor/golang.org/x/tools \
golang:xerrors:5ec99f83aff1:golang_xerrors/vendor/golang.org/x/xerrors \
google:go-cloud:v0.23.0:google_go_cloud/vendor/gocloud.dev \
Expand Down
10 changes: 5 additions & 5 deletions devel/gitaly/distinfo
View file
@@ -1,4 +1,4 @@
TIMESTAMP = 1649991821
TIMESTAMP = 1650541273
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-v0.13.0_GH0.tar.gz) = 6bf7145210331efa3f0417f6684cf764c22743cf23122048ec136600daebf443
Expand Down Expand Up @@ -117,8 +117,8 @@ SHA256 (golang-sys-4dd72447c267_GH0.tar.gz) = 046e3dfe88c8788c03df268704fe3477de
SIZE (golang-sys-4dd72447c267_GH0.tar.gz) = 1222385
SHA256 (golang-text-v0.3.6_GH0.tar.gz) = f66bebcf21985b0a713d67c6c35dfc9800d3b6d00d62b83ed0ce5b2ed4cb9760
SIZE (golang-text-v0.3.6_GH0.tar.gz) = 8351095
SHA256 (golang-time-f8bda1e9f3ba_GH0.tar.gz) = e068a34e54894c9c189ba2c2e5b7ea9116ed661f6a7c0d0e744d8e0066017ebb
SIZE (golang-time-f8bda1e9f3ba_GH0.tar.gz) = 9656
SHA256 (golang-time-0e9765cccd65_GH0.tar.gz) = ef4874b5cdfc2d21bb17e38c9a691e9e66c924cea852c8999fea7b08a649aab7
SIZE (golang-time-0e9765cccd65_GH0.tar.gz) = 10226
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
Expand Down Expand Up @@ -281,8 +281,8 @@ SHA256 (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 7ce80a93d0fdbeb6760f97d6d166d11c215
SIZE (xanzy-ssh-agent-v0.3.0_GH0.tar.gz) = 8421
SHA256 (gonum-gonum-v0.8.2_GH0.tar.gz) = a2aad1ac038d36d568939910f39eb0c58cae3c6f0b18df3ca74a8daa954d1663
SIZE (gonum-gonum-v0.8.2_GH0.tar.gz) = 3226037
SHA256 (gitlab-org-gitaly-b17cdf96c4a7ec7a81b44fd5ffdb964c596d7fcd_GL0.tar.gz) = e494a0019aaba164863f086a1896611dcf3a3603b270121d7c55b5bd9a7fe731
SIZE (gitlab-org-gitaly-b17cdf96c4a7ec7a81b44fd5ffdb964c596d7fcd_GL0.tar.gz) = 3850512
SHA256 (gitlab-org-gitaly-1478932866d068186c3a8af85fa11e5a97f5558e_GL0.tar.gz) = 3d00f3ad8471908b0088aedd73d46dd17b19029e6fd40a10a71b6db1bb17f96a
SIZE (gitlab-org-gitaly-1478932866d068186c3a8af85fa11e5a97f5558e_GL0.tar.gz) = 3880674
SHA256 (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = a00e10d3dbe50e7c70b75c5fcf7d42a039a24c13b0b751a0339bb18261ac50af
SIZE (gitlab-org-gitlab-shell-50da611814d256c77e689977265ec7e07633a4dc_GL0.tar.gz) = 124516
SHA256 (gitlab-org-labkit-397363e2404ac0276b1959373a1c1c2bc1610d67_GL0.tar.gz) = e48dae8ea183f946189a9ac7e4cbe4bc0fa583e6baafb0074a3463a879565ecb
Expand Down
26 changes: 13 additions & 13 deletions devel/gitaly/files/patch-Makefile
View file
@@ -1,24 +1,24 @@
--- Makefile.orig 2022-03-21 09:11:43 UTC
--- Makefile.orig 2022-04-21 05:54:57 UTC
+++ Makefile
@@ -314,7 +314,7 @@ help:
@@ -271,7 +271,7 @@ build: ${SOURCE_DIR}/.ruby-bundle ${GITALY_EXECUTABLES
gitaly: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS}
praefect: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS}
gitaly-git2go-v14: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS}
-gitaly-git2go-v14: libgit2
+#gitaly-git2go-v14: libgit2

.PHONY: build
## Build Go binaries and install required Ruby Gems.
-build: ${SOURCE_DIR}/.ruby-bundle libgit2
+build: ${SOURCE_DIR}/.ruby-bundle
@ # We used to install Gitaly binaries into the source directory by default when executing
@ # "make" or "make all", which has been changed in v14.5 to only build binaries into
@ # `_build/bin`. In order to quickly fail in case any source install still refers to these
@@ -345,7 +345,7 @@ $(call find_commands):
.PHONY: ${GITALY_EXECUTABLES}
${GITALY_EXECUTABLES}:
@@ -283,7 +283,7 @@ ${GITALY_EXECUTABLES}:
@ # This fallback is unique but non-deterministic, making it sufficient to avoid generating the
@ # GNU build-id from the empty string and causing guaranteed collisions.
GO_BUILD_ID=$$( go tool buildid $(addprefix ${BUILD_DIR}/bin/, $@) || openssl rand -hex 32 ) && \
${Q}GO_BUILD_ID=$$( go tool buildid $(addprefix ${BUILD_DIR}/bin/, $@) || openssl rand -hex 32 ) && \
- GNU_BUILD_ID=$$( echo $$GO_BUILD_ID | sha1sum | cut -d' ' -f1 ) && \
+ GNU_BUILD_ID=$$( echo $$GO_BUILD_ID | sha1 | cut -d' ' -f1 ) && \
go install -ldflags '${GO_LDFLAGS}'" -B 0x$$GNU_BUILD_ID" -tags "${GO_BUILD_TAGS}" $(addprefix ${GITALY_PACKAGE}/cmd/, $@)
endif

@@ -559,7 +559,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
.PHONY: install
@@ -482,7 +482,7 @@ libgit2: ${LIBGIT2_INSTALL_DIR}/lib/libgit2.a
# 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
Expand Down
4 changes: 2 additions & 2 deletions devel/gitaly/files/patch-ruby_Gemfile
View file
@@ -1,12 +1,12 @@
--- ruby/Gemfile.orig 2022-02-21 12:41:47 UTC
--- ruby/Gemfile.orig 2022-04-20 09:55:22 UTC
+++ ruby/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'

gem 'rugged', '~> 1.2'
gem 'github-linguist', '~> 7.12', require: 'linguist'
-gem 'gitlab-markup', '~> 1.7.1'
+gem 'gitlab-markup', '~> 1.8.0'
gem 'activesupport', '~> 6.1.4.6'
gem 'activesupport', '~> 6.1.4.7'
gem 'rdoc', '~> 6.0'
gem 'gitlab-gollum-lib', '~> 4.2.7.10.gitlab.2', require: false
@@ -13,29 +13,10 @@ gem 'faraday', '~> 1.0'
Expand Down

0 comments on commit b64a8ac

Please sign in to comment.