Commit f80b2fad authored by Nick Thomas's avatar Nick Thomas

Merge branch 'ship_with_jaeger_by_default' into 'master'

Statically link jaeger into Workhorse by default

See merge request gitlab-org/gitlab-workhorse!359
parents ff2634a5 54540039
...@@ -14,6 +14,7 @@ VERSION := ${VERSION_STRING}-$(shell date -u +%Y%m%d.%H%M%S) ...@@ -14,6 +14,7 @@ VERSION := ${VERSION_STRING}-$(shell date -u +%Y%m%d.%H%M%S)
GOBUILD := go build -ldflags "-X main.Version=$(VERSION)" GOBUILD := go build -ldflags "-X main.Version=$(VERSION)"
EXE_ALL := gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse EXE_ALL := gitlab-zip-cat gitlab-zip-metadata gitlab-workhorse
INSTALL := install INSTALL := install
BUILD_TAGS := tracer_static tracer_static_jaeger
MINIMUM_SUPPORTED_GO_VERSION := 1.8 MINIMUM_SUPPORTED_GO_VERSION := 1.8
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment