diff options
author | Rémy Coutable <remy@rymai.me> | 2016-06-13 13:56:18 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-06-13 13:56:18 +0000 |
commit | 57ebd3996eb5d8ff85c5899c7a7f351272655562 (patch) | |
tree | 3fc247f70cd4534da012ba41401d1b8f72409938 | |
parent | b080d88a6bf7c3873b4b74acb5367bb93931210d (diff) | |
parent | b43c6c43b4098f0633f24fbdc0ff249e3e6d4edc (diff) | |
download | gitlab-ce-57ebd3996eb5d8ff85c5899c7a7f351272655562.tar.gz |
Merge branch 'cache-apt-and-ruby-only' into 'master'
Cache only apt and ruby from vendor
## What does this MR do?
Optimises caching mechanism when testing gitlab-ce/ee repositories.
See merge request !4619
-rw-r--r-- | .gitlab-ci.yml | 3 | ||||
-rwxr-xr-x | scripts/prepare_build.sh | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3dc48a89463..f1dcf990629 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,8 @@ services: cache: key: "ruby21" paths: - - vendor + - vendor/apt + - vendor/ruby variables: MYSQL_ALLOW_EMPTY_PASSWORD: "1" diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh index d6fb1a34e8c..7e71a030901 100755 --- a/scripts/prepare_build.sh +++ b/scripts/prepare_build.sh @@ -16,10 +16,10 @@ retry() { } if [ -f /.dockerenv ] || [ -f ./dockerinit ]; then - mkdir -p vendor + mkdir -p vendor/apt # Install phantomjs package - pushd vendor + pushd vendor/apt if [ ! -e 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 fi |