Merge branch 'leipert-add-memory-info' into 'master'

Set `max_old_space_size` option of node to 3.5GB during compile:assets

See merge request gitlab-org/gitlab-ce!19624
This commit is contained in:
Tim Zallmann 2018-06-11 13:59:55 +00:00
commit 35748c0899
2 changed files with 7 additions and 1 deletions

View File

@ -394,7 +394,11 @@ compile-assets:
- date
- yarn install --frozen-lockfile --cache-folder .yarn-cache
- date
- free -m
- bundle exec rake gitlab:assets:compile
variables:
# we override the max_old_space_size to prevent OOM errors
NODE_OPTIONS: --max_old_space_size=3584
artifacts:
expire_in: 7d
paths:
@ -658,10 +662,13 @@ gitlab:assets:compile:
SKIP_STORAGE_VALIDATION: "true"
WEBPACK_REPORT: "true"
NO_COMPRESSION: "true"
# we override the max_old_space_size to prevent OOM errors
NODE_OPTIONS: --max_old_space_size=3584
script:
- date
- yarn install --frozen-lockfile --production --cache-folder .yarn-cache
- date
- free -m
- bundle exec rake gitlab:assets:compile
artifacts:
name: webpack-report

View File

@ -1,4 +1,3 @@
const fs = require('fs');
const path = require('path');
const glob = require('glob');
const webpack = require('webpack');