summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2019-01-09 16:19:54 +0100
committerBob Van Landuyt <bob@vanlanduyt.co>2019-01-09 16:19:54 +0100
commitdf5b845301ab38b825359b829ce865be6dd5e45c (patch)
tree76c3d513276e3105b5d7609082d968d756daf1cf
parent3a76c8eb83e77f56bd27c5035f4299ded4add53c (diff)
downloadgitlab-shell-bvl-force-install-bundler.tar.gz
Force install bunderbvl-force-install-bundler
This avoids errors like: $ gem install --bindir /usr/local/bin bundler -v "$INSTALL_BUNDLER_VERSION" ERROR: Error installing bundler: "bundle" from bundler conflicts with /usr/local/bin/bundle
-rw-r--r--.gitlab-ci.yml4
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