From df5b845301ab38b825359b829ce865be6dd5e45c Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@vanlanduyt.co>
Date: Wed, 9 Jan 2019 16:19:54 +0100
Subject: Force install bunder

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
---
 .gitlab-ci.yml | 4 ++--
 1 file 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
-- 
cgit v1.2.1