diff options
| author | James Fargher <proglottis@gmail.com> | 2021-03-22 00:37:36 +0300 |
|---|---|---|
| committer | James Fargher <proglottis@gmail.com> | 2021-03-22 00:37:36 +0300 |
| commit | 6314c40a2e0ae9d43eb4c01026d0aef57c10d91c (patch) | |
| tree | 33221395d2d338a109451d44acc6c6984b1c8988 /Makefile | |
| parent | 6f0bfe7c326aeabcb5c3bc35bd3994160d20d6c3 (diff) | |
| parent | 365674695fcbc1ac6332cb8bbc646441e1e0f15a (diff) | |
Merge branch 'bundleflag' into 'master'
Remove deprecated bundle flag
See merge request gitlab-org/gitaly!3199
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -51,12 +51,12 @@ GOLANGCI_LINT_OPTIONS ?= GOLANGCI_LINT_CONFIG ?= ${SOURCE_DIR}/.golangci.yml # Build information -BUNDLE_FLAGS ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo --no-deployment || echo --deployment) -GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly -BUILD_TIME := $(shell date +"%Y%m%d.%H%M%S") -GITALY_VERSION := $(shell git describe --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown) -GO_LDFLAGS := -ldflags '-X ${GITALY_PACKAGE}/internal/version.version=${GITALY_VERSION} -X ${GITALY_PACKAGE}/internal/version.buildtime=${BUILD_TIME}' -GO_BUILD_TAGS := tracer_static,tracer_static_jaeger,continuous_profiler_stackdriver,static,system_libgit2 +BUNDLE_DEPLOYMENT ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo false || echo true) +GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly +BUILD_TIME := $(shell date +"%Y%m%d.%H%M%S") +GITALY_VERSION := $(shell git describe --match v* 2>/dev/null | sed 's/^v//' || cat ${SOURCE_DIR}/VERSION 2>/dev/null || echo unknown) +GO_LDFLAGS := -ldflags '-X ${GITALY_PACKAGE}/internal/version.version=${GITALY_VERSION} -X ${GITALY_PACKAGE}/internal/version.buildtime=${BUILD_TIME}' +GO_BUILD_TAGS := tracer_static,tracer_static_jaeger,continuous_profiler_stackdriver,static,system_libgit2 # Dependency versions GOLANGCI_LINT_VERSION ?= 1.33.0 @@ -381,8 +381,9 @@ 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 + ${Q}cd ${GITALY_RUBY_DIR} && bundle config set --local deployment "${BUNDLE_DEPLOYMENT}" ${Q}cd ${GITALY_RUBY_DIR} && bundle config # for debugging - ${Q}cd ${GITALY_RUBY_DIR} && bundle install ${BUNDLE_FLAGS} + ${Q}cd ${GITALY_RUBY_DIR} && bundle install ${Q}touch $@ ${SOURCE_DIR}/NOTICE: ${BUILD_DIR}/NOTICE |