diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-11 13:59:55 +0000 |
|---|---|---|
| committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-06-11 13:59:55 +0000 |
| commit | 35748c0899573c03297a4833250243af606f5efb (patch) | |
| tree | 6c09dd2ec5e6f2b913bf94d3e66330c0918a3207 | |
| parent | 6d92a7a049bafcc83703ddc68c72d272f38d4b7f (diff) | |
| parent | 762c623997b2077258b59c70dcfae8a456d39fd2 (diff) | |
| download | gitlab-ce-35748c0899573c03297a4833250243af606f5efb.tar.gz | |
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
| -rw-r--r-- | .gitlab-ci.yml | 7 | ||||
| -rw-r--r-- | config/webpack.config.js | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 267a954d0eb..ba0c5074839 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/config/webpack.config.js b/config/webpack.config.js index e760ce1cb8c..b1e378f6c27 100644 --- a/config/webpack.config.js +++ b/config/webpack.config.js @@ -1,4 +1,3 @@ -const fs = require('fs'); const path = require('path'); const glob = require('glob'); const webpack = require('webpack'); |