summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2015-11-10 13:37:34 +0000
committerJacob Vosmaer <contact@jacobvosmaer.nl>2015-11-10 13:37:34 +0000
commit79fdf65c71e90773fbf52d6832b74cf5a7124755 (patch)
tree43ae442b079a32faf34b87f5c607f10f4e8bfbea
parentcdaa9aecac5d7c93399e87330fa42eaa2eacc2a3 (diff)
parent94babbbc06d18c09e867dd8ace1f343594b00ef7 (diff)
downloadgitlab-shell-79fdf65c71e90773fbf52d6832b74cf5a7124755.tar.gz
Merge branch 'shared-runner' into 'master'
Adapt gitlab-ci.yml for shared runners After merging this we should disconnect the specific runner on gitlab-org/gitlab-shell. See merge request !27
-rw-r--r--.gitlab-ci.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fa4f2d4..784e8d5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,8 @@
before_script:
- - export PATH=~/bin:/usr/local/bin:/usr/bin:/bin
- - gem install bundler
+ - export PATH=~/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin
+ - apt-get update
+ - apt-get install -y git-annex
+ - gem install --bindir /usr/local/bin bundler
- cp config.yml.example config.yml
- bundle install
@@ -8,7 +10,6 @@ rspec:
script:
- bundle exec rspec spec
tags:
- - git-annex
- ruby
except:
- tags