From ecf264e07f622a0dd55dda363ef6c0fecc228668 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Tue, 25 Aug 2020 09:26:57 +0200 Subject: Reintroduce gitaly-git2go support With commit a6091637 (Merge branch 'pks-revert-git2go' into 'master', 2020-07-31), our new Git2Go dependency was reverted again due to several issues: - Some distributions didn't have a recent enough version of CMake available. As a result, building libgit2 failed. This was fixed by bumping the build images' CMake version. - Build tags didn't work as expected and thus we ended up not using them at all. This was fixed by passing build flags via the Makefile. As this causes e.g. `go test ./...` to fail with a linking error due to build tags not being specified and the PKG_CONFIG_PATH not being set up as required. To work around this issue and not break developer workflows, gitaly-git2go will now only be built if build tags required for git2go are set. - Invalidation of libgit2.a didn't work as required. E.g. if the Makefile changes, it wasn't rebuilt and it was thus impossible to provide fixes for any broken setups if libgit2.a was built already. This was fixed by adding a build dependency on the Makefile. All in all, this should fix all currently known problems with building libgit2. --- go.sum | 3 +++ 1 file changed, 3 insertions(+) (limited to 'go.sum') diff --git a/go.sum b/go.sum index c91a01b46..5c96bf646 100644 --- a/go.sum +++ b/go.sum @@ -199,7 +199,10 @@ github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvf github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/lib/pq v1.2.0 h1:LXpIM/LZ5xGFhOpXAQUIMM1HdyqzVYM13zNdjCEEcA0= github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/libgit2/git2go v0.0.0-20190104134018-ecaeb7a21d47 h1:HDt7WT3kpXSHq4mlOuLzgXH9LeOK1qlhyFdKIAzxxeM= github.com/libgit2/git2go v0.0.0-20190104134018-ecaeb7a21d47/go.mod h1:4bKN42efkbNYMZlvDfxGDxzl066GhpvIircZDsm8Y+Y= +github.com/libgit2/git2go/v30 v30.0.5 h1:gxKqXOslpvYDZNC62f8GV34TAk0qw4wZ++IdYw8V9I4= +github.com/libgit2/git2go/v30 v30.0.5/go.mod h1:YReiQ7xhMoyAL4ISYFLZt+OGqn6xtLqvTC1xJ9oAH7Y= github.com/lightstep/lightstep-tracer-go v0.15.6 h1:D0GGa7afJ7GcQvu5as6ssLEEKYXvRgKI5d5cevtz8r4= github.com/lightstep/lightstep-tracer-go v0.15.6/go.mod h1:6AMpwZpsyCFwSovxzM78e+AsYxE8sGwiM6C3TytaWeI= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= -- cgit v1.2.3