diff options
| author | Toon Claes <toon@gitlab.com> | 2021-10-11 17:20:14 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-10-11 17:20:14 +0300 |
| commit | 34de8b7960d7a46ac1ab8009d2fe78a4f2384c4f (patch) | |
| tree | 15df9f0f09f245604f0f04a063179b9c984cfe99 /Makefile | |
| parent | 69eac9a0db256b27a8872f6e871e5d7e61485471 (diff) | |
Makefile: Never ruby bundle as deployment
During the bundle step of the gitaly-ruby gems it tries to guess whether
it is part of a gitlab-development-kit. If it isn't it installs gems as
a "deployment", which will install the gems in vendor/bundle instead of
in $GEM_HOME. To detect this, it looks for .gdk-install-root in the
parent directory. This behavior is unexpected to many and also seems to
cause issues for some users.
Added to that, recently a change [1] was made to gitlab-org/gitlab to
install gems in $GEM_HOME when running tests. This speeds up the
installation of Gitaly. This change made it so the gems are never
installed as a "deployment"
This change removes the code to determine whether it's a deployment and
makes the gems install in $GEM_HOME unconditionally.
1. https://gitlab.com/gitlab-org/gitlab/-/commit/77f41fff0363ec0b1bc687e8df02995729e8218e
Issue: https://gitlab.com/gitlab-org/gitlab-development-kit/-/issues/1315
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -61,7 +61,6 @@ GOLANGCI_LINT_OPTIONS ?= GOLANGCI_LINT_CONFIG ?= ${SOURCE_DIR}/.golangci.yml # Build information -BUNDLE_DEPLOYMENT ?= $(shell test -f ${SOURCE_DIR}/../.gdk-install-root && echo false || echo true) GITALY_PACKAGE := gitlab.com/gitlab-org/gitaly/v14 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) @@ -473,8 +472,6 @@ 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 ${Q}touch $@ |