Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
ci-specific build (no webpack progress)
Browse files Browse the repository at this point in the history
  • Loading branch information
jacogr committed Oct 9, 2016
1 parent 7af3526 commit 032e796
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ js-test:
before_script:
- ./js/scripts/install-deps.sh
script:
- ./js/scripts/build.sh
- ./js/scripts/test.sh
- ./js/scripts/build.sh
tags:
- javascript-test
3 changes: 3 additions & 0 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
"build": "npm run build:dll && npm run build:app",
"build:app": "webpack --progress",
"build:dll": "webpack --config webpack.vendor.js --progress",
"ci:build": "npm run ci:build:dll && npm run ci:build:app",
"ci:build:app": "NODE_ENV=production webpack",
"ci:build:dll": "NODE_ENV=production webpack --config webpack.vendor.js",
"clean": "rm -rf ./build ./coverage",
"coveralls": "npm run testCoverage && coveralls < coverage/lcov.info",
"lint": "eslint --ignore-path .gitignore ./src/",
Expand Down
2 changes: 1 addition & 1 deletion js/scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cd ..

# run build (production) and store the exit code
EXITCODE=0
NODE_ENV=production npm run build || EXITCODE=1
npm run ci:build || EXITCODE=1

# back to root
popd
Expand Down

0 comments on commit 032e796

Please sign in to comment.