diff options
| author | Toon Claes <toon@gitlab.com> | 2021-10-12 16:45:30 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2021-10-12 16:45:30 +0300 |
| commit | 683948e26d5b1204348e384c3b35e32b99a4241e (patch) | |
| tree | f604175e08519dccce9d637fc090b76a473c2473 | |
| parent | a998de3b5fcffd7b0ab96a26c16ab2baa78e7d1c (diff) | |
Makefile: Revert changes to ruby bundlerevert-bundle-deployment
We've seen users, and CI failing [1] on the changes made in [2], so
revert it.
1. https://gitlab.com/gitlab-org/gitlab/-/merge_requests/72178
2. 34de8b796 (Makefile: Never ruby bundle as deployment, 2021-10-11)
Issue: https://gitlab.com/gitlab-org/gitlab-development-kit/-/issues/1315
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -61,6 +61,7 @@ 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) @@ -472,6 +473,8 @@ 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 $@ |