diff options
| author | James Lopez <james@jameslopez.es> | 2016-02-18 11:12:26 +0100 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-02-18 11:12:26 +0100 |
| commit | c9be4d65f2d3f6695e99cc7f99ad889b48780e3b (patch) | |
| tree | fda0d78e73795cb8da353e52344b04787cca3802 /scripts | |
| parent | 8006d025139a506f732137209c85935353bae276 (diff) | |
| parent | 8b918267c7477f7e1a36b4f3cc12c9e244204cb9 (diff) | |
| download | gitlab-ce-c9be4d65f2d3f6695e99cc7f99ad889b48780e3b.tar.gz | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into feature/slack-notifications-on-ci
# Conflicts:
# .gitlab-ci.yml
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/prepare_build.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index 5987988dc8e..b6f076a90c3 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -1,15 +1,15 @@ #!/bin/bash if [ -f /.dockerinit ]; then - # Docker runners use `/cache` folder which is persisted every build - if [ ! -e /cache/phantomjs_1.9.8-0jessie_amd64.deb ]; then + mkdir -p vendor + if [ ! -e vendor/phantomjs_1.9.8-0jessie_amd64.deb ]; then wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb - mv phantomjs_1.9.8-0jessie_amd64.deb /cache + mv phantomjs_1.9.8-0jessie_amd64.deb vendor/ fi - dpkg -i /cache/phantomjs_1.9.8-0jessie_amd64.deb + dpkg -i vendor/phantomjs_1.9.8-0jessie_amd64.deb apt-get update -qq - apt-get -o dir::cache::archives="/cache/apt" install -y -qq --force-yes \ + apt-get -o dir::cache::archives="vendor/apt" install -y -qq --force-yes \ libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip cp config/database.yml.mysql config/database.yml @@ -20,7 +20,7 @@ if [ -f /.dockerinit ]; then cp config/resque.yml.example config/resque.yml sed -i 's/localhost/redis/g' config/resque.yml - export FLAGS=(--path /cache) + export FLAGS=(--path vendor) else export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin cp config/database.yml.mysql config/database.yml |