Commit c492706d authored by Tim Zallmann's avatar Tim Zallmann

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-ee!6071
parents 11d47876 0f0baaee
...@@ -529,7 +529,11 @@ compile-assets: ...@@ -529,7 +529,11 @@ compile-assets:
- date - date
- yarn install --frozen-lockfile --cache-folder .yarn-cache - yarn install --frozen-lockfile --cache-folder .yarn-cache
- date - date
- free -m
- bundle exec rake gitlab:assets:compile - 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: artifacts:
expire_in: 7d expire_in: 7d
paths: paths:
...@@ -826,10 +830,13 @@ gitlab:assets:compile: ...@@ -826,10 +830,13 @@ gitlab:assets:compile:
SKIP_STORAGE_VALIDATION: "true" SKIP_STORAGE_VALIDATION: "true"
WEBPACK_REPORT: "true" WEBPACK_REPORT: "true"
NO_COMPRESSION: "true" NO_COMPRESSION: "true"
# we override the max_old_space_size to prevent OOM errors
NODE_OPTIONS: --max_old_space_size=3584
script: script:
- date - date
- yarn install --frozen-lockfile --production --cache-folder .yarn-cache - yarn install --frozen-lockfile --production --cache-folder .yarn-cache
- date - date
- free -m
- bundle exec rake gitlab:assets:compile - bundle exec rake gitlab:assets:compile
artifacts: artifacts:
name: webpack-report name: webpack-report
......
const fs = require('fs');
const path = require('path'); const path = require('path');
const glob = require('glob'); const glob = require('glob');
const webpack = require('webpack'); const webpack = require('webpack');
...@@ -232,9 +231,7 @@ module.exports = { ...@@ -232,9 +231,7 @@ module.exports = {
new VueLoaderPlugin(), new VueLoaderPlugin(),
// automatically configure monaco editor web workers // automatically configure monaco editor web workers
new MonacoWebpackPlugin({ new MonacoWebpackPlugin(),
features: [],
}),
// prevent pikaday from including moment.js // prevent pikaday from including moment.js
new webpack.IgnorePlugin(/moment/, /pikaday/), new webpack.IgnorePlugin(/moment/, /pikaday/),
...@@ -302,7 +299,7 @@ module.exports = { ...@@ -302,7 +299,7 @@ module.exports = {
inline: DEV_SERVER_LIVERELOAD, inline: DEV_SERVER_LIVERELOAD,
}, },
devtool: IS_PRODUCTION ? 'nosources-source-map' : 'cheap-module-eval-source-map', devtool: IS_PRODUCTION ? 'source-map' : 'cheap-module-eval-source-map',
// sqljs requires fs // sqljs requires fs
node: { fs: 'empty' }, node: { fs: 'empty' },
......
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