diff options
| author | Toon Claes <toon@gitlab.com> | 2020-11-02 16:19:45 +0300 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2020-11-02 16:19:45 +0300 |
| commit | 13db714038ff86a88dbedcc2657c6c75308b603d (patch) | |
| tree | 6c34d6bd2b6975216da878e0439c4c1a36f4fdeb | |
| parent | bfeb9cadbd4c02affa52d32bdd55a8c7b0f7147a (diff) | |
| parent | 6b8f365b54f77a7dcd2dbba2425e6d25a7b20271 (diff) | |
Merge branch 'sh-update-bundler-2' into 'master'
Update to bundler v2.1.4
See merge request gitlab-org/gitaly!2733
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | _support/build-images/versioned/Dockerfile | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-update-bundler-2.yml | 5 | ||||
| -rw-r--r-- | ruby/Gemfile | 3 | ||||
| -rw-r--r-- | ruby/Gemfile.lock | 3 |
5 files changed, 7 insertions, 7 deletions
@@ -350,7 +350,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 - gem install bundler -v 1.17.3 ${Q}cd ${GITALY_RUBY_DIR} && bundle config # for debugging ${Q}cd ${GITALY_RUBY_DIR} && bundle install ${BUNDLE_FLAGS} ${Q}touch $@ diff --git a/_support/build-images/versioned/Dockerfile b/_support/build-images/versioned/Dockerfile index d598a85eb..ca25a8dc6 100644 --- a/_support/build-images/versioned/Dockerfile +++ b/_support/build-images/versioned/Dockerfile @@ -8,4 +8,4 @@ COPY ./Gemfile.lock /bundle-cache RUN DEBIAN_FRONTEND=noninteractive apt-get update -qq && \ DEBIAN_FRONTEND=noninteractive apt-get install -qq -y rubygems bundler cmake build-essential libicu-dev && \ - cd /bundle-cache && gem install bundler -v 1.17.3 && bundle install --path vendor/bundle + cd /bundle-cache && bundle install --path vendor/bundle diff --git a/changelogs/unreleased/sh-update-bundler-2.yml b/changelogs/unreleased/sh-update-bundler-2.yml new file mode 100644 index 000000000..29ea7ed25 --- /dev/null +++ b/changelogs/unreleased/sh-update-bundler-2.yml @@ -0,0 +1,5 @@ +--- +title: Update to bundler v2.1.4 +merge_request: 2733 +author: +type: other diff --git a/ruby/Gemfile b/ruby/Gemfile index bc2cd390e..7f336756e 100644 --- a/ruby/Gemfile +++ b/ruby/Gemfile @@ -1,8 +1,5 @@ source 'https://rubygems.org' -# Require bundler >= 1.16.5 to avoid this bug: https://github.com/bundler/bundler/issues/6537 -gem 'bundler', '>= 1.17.3' - gem 'rugged', '~> 0.28' gem 'github-linguist', '~> 7.11', require: 'linguist' gem 'gitlab-markup', '~> 1.7.1' diff --git a/ruby/Gemfile.lock b/ruby/Gemfile.lock index d69be8d1c..cf62166fd 100644 --- a/ruby/Gemfile.lock +++ b/ruby/Gemfile.lock @@ -195,7 +195,6 @@ PLATFORMS DEPENDENCIES activesupport (~> 6.0.3.3) - bundler (>= 1.17.3) factory_bot faraday (~> 1.0) github-linguist (~> 7.11) @@ -218,4 +217,4 @@ DEPENDENCIES timecop BUNDLED WITH - 1.17.3 + 2.1.4 |