Commit 5031efa0 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'cache-production-assets' into 'master'

Provide a cached archive of compiled assets

See merge request gitlab-org/gitlab-ce!21078
parents b16dd6f0 636aa7d3
...@@ -708,7 +708,6 @@ gitlab:assets:compile: ...@@ -708,7 +708,6 @@ gitlab:assets:compile:
SETUP_DB: "false" SETUP_DB: "false"
SKIP_STORAGE_VALIDATION: "true" SKIP_STORAGE_VALIDATION: "true"
WEBPACK_REPORT: "true" WEBPACK_REPORT: "true"
NO_COMPRESSION: "true"
# we override the max_old_space_size to prevent OOM errors # we override the max_old_space_size to prevent OOM errors
NODE_OPTIONS: --max_old_space_size=3584 NODE_OPTIONS: --max_old_space_size=3584
script: script:
...@@ -722,6 +721,7 @@ gitlab:assets:compile: ...@@ -722,6 +721,7 @@ gitlab:assets:compile:
expire_in: 31d expire_in: 31d
paths: paths:
- webpack-report/ - webpack-report/
- public/assets/
karma: karma:
<<: *dedicated-no-docs-and-no-qa-pull-cache-job <<: *dedicated-no-docs-and-no-qa-pull-cache-job
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment