diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-05-12 13:09:49 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-05-16 00:18:45 -0500 |
| commit | e5a18cd731f9fb2f66e2764bf6cafd783a67bcb6 (patch) | |
| tree | 55486738228e228517a8f20561f1def57b1b364e | |
| parent | 84199f19197583da44471a6b7f91694b7f4645df (diff) | |
| download | gitlab-ce-e5a18cd731f9fb2f66e2764bf6cafd783a67bcb6.tar.gz | |
instruct yarn to utilize the persistant .yarn-cache directory
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index f3decfd7dfe..89da29fd790 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ eslint-report.html .sass-cache/ /.secret /.vagrant +/.yarn-cache /.byebug_history /Vagrantfile /backups/* diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7fbfda4a5a8..f4f601b4d0e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ cache: key: "ruby-233" paths: - vendor/ruby + - .yarn-cache variables: MYSQL_ALLOW_EMPTY_PASSWORD: "1" @@ -186,7 +187,7 @@ setup-test-env: stage: prepare script: - node --version - - yarn install --pure-lockfile + - yarn install --pure-lockfile --cache-folder .yarn-cache - bundle exec rake gitlab:assets:compile - bundle exec ruby -Ispec -e 'require "spec_helper" ; TestEnv.init' artifacts: @@ -400,7 +401,8 @@ rake gitlab:assets:compile: SKIP_STORAGE_VALIDATION: "true" WEBPACK_REPORT: "true" script: - - bundle exec rake yarn:install gitlab:assets:compile + - yarn install --pure-lockfile --production --cache-folder .yarn-cache + - bundle exec rake gitlab:assets:compile artifacts: name: webpack-report expire_in: 31d |