summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2019-04-02 19:27:38 +1100
committerSimon Knox <psimyn@gmail.com>2019-04-04 14:44:04 +1100
commit8e6b6528543818a779e1df2b38150eb422145fb0 (patch)
tree87e82278bae33f16c50606b1bb171aa04fb69a13
parente08c693babaf1a774061ce2bd185946f4717e8ec (diff)
downloadgitlab-ce-8e6b6528543818a779e1df2b38150eb422145fb0.tar.gz
Fix webpack dev-server crash due to memory limitwebpack-memory-bump
Remove unneeded var for webpack-prod call in gitlab-ci
-rw-r--r--.gitlab-ci.yml3
-rw-r--r--package.json6
2 files changed, 4 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ab38c87039e..7e38952358b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -852,8 +852,6 @@ qa:selectors:
.qa-frontend-node: &qa-frontend-node
<<: *dedicated-no-docs-no-db-pull-cache-job
stage: test
- variables:
- NODE_OPTIONS: --max_old_space_size=3584
cache:
key: "$CI_JOB_NAME"
paths:
@@ -1145,3 +1143,4 @@ schedule:review-performance:
<<: *review-schedules-only
script:
- wait_for_job_to_be_done "schedule:review-deploy"
+
diff --git a/package.json b/package.json
index 90fcfe01438..a83d5e233bf 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"private": true,
"scripts": {
"clean": "rm -rf public/assets tmp/cache/*-loader",
- "dev-server": "nodemon -w 'config/webpack.config.js' --exec 'webpack-dev-server --config config/webpack.config.js'",
+ "dev-server": "NODE_OPTIONS=\"--max-old-space-size=3584\" nodemon -w 'config/webpack.config.js' --exec 'webpack-dev-server --config config/webpack.config.js'",
"eslint": "eslint --max-warnings 0 --report-unused-disable-directives --ext .js,.vue .",
"eslint-fix": "eslint --max-warnings 0 --report-unused-disable-directives --ext .js,.vue --fix .",
"eslint-report": "eslint --max-warnings 0 --ext .js,.vue --format html --output-file ./eslint-report.html --no-inline-config .",
@@ -20,8 +20,8 @@
"stylelint-file": "node node_modules/stylelint/bin/stylelint.js",
"stylelint-create-utility-map": "node scripts/frontend/stylelint/stylelint-utility-map.js",
"test": "yarn jest && yarn karma",
- "webpack": "webpack --config config/webpack.config.js",
- "webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
+ "webpack": "NODE_OPTIONS=\"--max-old-space-size=3584\" webpack --config config/webpack.config.js",
+ "webpack-prod": "NODE_OPTIONS=\"--max-old-space-size=3584\" NODE_ENV=production webpack --config config/webpack.config.js"
},
"dependencies": {
"@babel/core": "^7.2.2",