diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-01-04 13:34:08 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-01-04 13:34:08 +0000 |
| commit | 13d5b635849edbbfb34e7ea6c4c97d2c83327ac6 (patch) | |
| tree | 3a4af5e626c77ff63ed493a0e7a7f1ca834e3b53 | |
| parent | a5dda1a2096a39cbce7a05b9f82b937bc5ecb774 (diff) | |
| parent | bd564ce7c4632de3681eab7297ef6e3f8fc75f92 (diff) | |
| download | gitlab-shell-13d5b635849edbbfb34e7ea6c4c97d2c83327ac6.tar.gz | |
Merge branch 'bvl-specify-bundler-version' into 'master'
Specify bundler 1.17 for ruby 2.1 and 2.2
See merge request gitlab-org/gitlab-shell!271
| -rw-r--r-- | .gitlab-ci.yml | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9e6e1a1..a51becb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,8 +1,11 @@ image: "ruby:2.3" +variables: + INSTALL_BUNDLER_VERSION: "~> 2.0.1" + before_script: - export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin - - gem install --bindir /usr/local/bin bundler + - gem install --bindir /usr/local/bin bundler -v "$INSTALL_BUNDLER_VERSION" - cp config.yml.example config.yml - bundle install @@ -33,6 +36,8 @@ rubocop: #ruby 2.2 rspec:ruby2.2: image: ruby:2.2 + variables: + INSTALL_BUNDLER_VERSION: ~> 1.17.3 <<: *rspec_definition tags: - ruby @@ -42,6 +47,8 @@ rspec:ruby2.2: #ruby 2.1 rspec:ruby2.1: image: ruby:2.1 + variables: + INSTALL_BUNDLER_VERSION: ~> 1.17.3 <<: *rspec_definition tags: - ruby |