diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-04-19 12:56:15 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-04-19 12:56:15 +0300 |
| commit | 30ebd9f34fe5c882a00dbe410bc38108f94f789c (patch) | |
| tree | 5230e625f16f33d776b3738790d551b3123fdddc | |
| parent | eb994c8362ab0d31d40c99e8678130f246246df7 (diff) | |
Use gitaly-proto 0.97.0
| -rw-r--r-- | CHANGELOG.md | 2 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | _support/gitaly-proto-tagged | 16 | ||||
| -rw-r--r-- | vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION | 2 | ||||
| -rw-r--r-- | vendor/vendor.json | 10 |
5 files changed, 29 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a4d2305bc..3b9c48e2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ UNRELEASED +- Use gitaly-proto 0.97.0 + https://gitlab.com/gitlab-org/gitaly/merge_requests/683 - Make gitaly-ruby's grpc server log at level WARN https://gitlab.com/gitlab-org/gitaly/merge_requests/681 - Add health checks for gitaly-ruby @@ -102,12 +102,16 @@ docker: $(TARGET_SETUP) docker build -t gitlab/gitaly:$(VERSION_PREFIXED) -t gitlab/gitaly:latest $(TARGET_DIR)/docker/ .PHONY: verify -verify: lint check-formatting megacheck govendor-status notice-up-to-date +verify: lint check-formatting megacheck govendor-status notice-up-to-date govendor-tagged .PHONY: govendor-status govendor-status: $(TARGET_SETUP) $(GOVENDOR) cd $(PKG_BUILD_DIR) && govendor status +.PHONY: govendor-tagged +govendor-tagged: $(TARGET_SETUP) $(GOVENDOR) + cd $(PKG_BUILD_DIR) && _support/gitaly-proto-tagged + $(TEST_REPO): git clone --bare https://gitlab.com/gitlab-org/gitlab-test.git $@ diff --git a/_support/gitaly-proto-tagged b/_support/gitaly-proto-tagged new file mode 100755 index 000000000..a94ab467c --- /dev/null +++ b/_support/gitaly-proto-tagged @@ -0,0 +1,16 @@ +#!/usr/bin/env ruby + +gitaly_proto_line = `govendor list | grep gitaly-proto` # safe to use backticks, no string interpolation +abort unless $?.success? + +puts gitaly_proto_line + +# Not sure what 'version_a' and 'version_b' are exactly, they seem to be identical most of the time. +_, _, _, version_a, version_b = gitaly_proto_line.split(/\s+/, 5) + +tag_regex = /^v[0-9]/ +unless version_a =~ tag_regex && version_b =~ tag_regex + abort "FAIL: govendor is not using a tagged version of gitaly-ruby" +end + +puts 'OK' diff --git a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION index 13bb62857..05e39cbb4 100644 --- a/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION +++ b/vendor/gitlab.com/gitlab-org/gitaly-proto/go/VERSION @@ -1 +1 @@ -0.96.0 +0.97.0 diff --git a/vendor/vendor.json b/vendor/vendor.json index 64651d420..6f35c3b4d 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -201,12 +201,12 @@ "revisionTime": "2017-12-31T12:27:32Z" }, { - "checksumSHA1": "DP5B3R9nsWjriE1zeI+eSZXFv3k=", + "checksumSHA1": "Ggq2MkKfVz/qDVZkOElMGl6ip4Y=", "path": "gitlab.com/gitlab-org/gitaly-proto/go", - "revision": "02104c24e18c047d093e2335016be99dbcc79ae3", - "revisionTime": "2018-04-12T09:43:41Z", - "version": "=master", - "versionExact": "master" + "revision": "9711d1590f0f3cf39b8725bc29058b72e5adfc9c", + "revisionTime": "2018-04-12T14:41:11Z", + "version": "v0.97.0", + "versionExact": "v0.97.0" }, { "checksumSHA1": "nqWNlnMmVpt628zzvyo6Yv2CX5Q=", |