diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-02-06 19:56:10 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-02-06 19:56:10 +0300 |
| commit | b6b98d9a0f0afb97d1a6009d8b509df0d0e1555c (patch) | |
| tree | 7278b03002c3afb4ccf5acbd377149c891497cf9 | |
| parent | 8ca9f8675f1df63ccb440fbc21273fd37cab085a (diff) | |
| parent | f4fa8583051eba4c6a63648b0893e3ea88535301 (diff) | |
Merge branch 'an-statically-link-jaeger-client-into-gitaly' into 'master'
Statically link jaeger into Gitaly by default
See merge request gitlab-org/gitaly!1063
| -rw-r--r-- | _support/makegen.go | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/_support/makegen.go b/_support/makegen.go index 3200f3d25..c381b149b 100644 --- a/_support/makegen.go +++ b/_support/makegen.go @@ -232,6 +232,7 @@ PREFIX ?= /usr/local INSTALL_DEST_DIR := $(DESTDIR)$(PREFIX)/bin/ BUNDLE_FLAGS ?= --deployment ASSEMBLY_ROOT ?= {{ .BuildDir }}/assembly +BUILD_TAGS := tracer_static tracer_static_jaeger unexport GOROOT unexport GOBIN diff --git a/changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml b/changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml new file mode 100644 index 000000000..fa1b2fc92 --- /dev/null +++ b/changelogs/unreleased/an-statically-link-jaeger-client-into-gitaly.yml @@ -0,0 +1,5 @@ +--- +title: Statically link jaeger into Gitaly by default +merge_request: 1063 +author: +type: other |