diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-12 23:05:19 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-12 23:05:19 +0200 |
| commit | b43c6c43b4098f0633f24fbdc0ff249e3e6d4edc (patch) | |
| tree | 244344924a0aebb529ef65fa2c66568dedfbfd3f | |
| parent | 8d243f9bdacea1909bf503eb715bd437c3b48aa7 (diff) | |
| download | gitlab-ce-cache-apt-and-ruby-only.tar.gz | |
Cache only apt and ruby from vendorcache-apt-and-ruby-only
Since introduction of gitignore the vendor folder contains also gitignores which affects detection when to update a cache.
We explicitly cache only apt and ruby folders.
| -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 |