diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-01-09 17:36:36 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-01-09 17:36:36 +0000 |
| commit | 6c5b195353a632095d7f672d28b9985fd879b077 (patch) | |
| tree | 76c3d513276e3105b5d7609082d968d756daf1cf | |
| parent | 3a76c8eb83e77f56bd27c5035f4299ded4add53c (diff) | |
| parent | df5b845301ab38b825359b829ce865be6dd5e45c (diff) | |
| download | gitlab-shell-6c5b195353a632095d7f672d28b9985fd879b077.tar.gz | |
Merge branch 'bvl-force-install-bundler' into 'master'
Force install bunder
See merge request gitlab-org/gitlab-shell!272
| -rw-r--r-- | .gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a51becb..72b8864 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ variables: 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 -v "$INSTALL_BUNDLER_VERSION" + - gem install --force --bindir /usr/local/bin bundler -v "$INSTALL_BUNDLER_VERSION" - cp config.yml.example config.yml - bundle install @@ -16,7 +16,7 @@ before_script: # # The full rspec suite is also run against each suppported golang version - cp bin/gitlab-shell-ruby bin/gitlab-shell - - bundle exec rspec --color --format d spec + - bundle exec rspec --color --tag ~go --format d spec rspec: <<: *rspec_definition |