Skip to content
Snippets Groups Projects
Commit 208205d8 authored by Cam Saul's avatar Cam Saul
Browse files

Eliminate CircleCI bottleneck.

parent b3944552
No related merge requests found
......@@ -3,13 +3,8 @@
echo "Running 'npm install' to download javascript dependencies..." &&
npm install &&
if [ -n "$CI_DISABLE_WEBPACK_MINIFICATION" ]; then
echo "Running 'webpack' to assemble and minify frontend assets..."
./node_modules/webpack/bin/webpack.js
else
echo "Running 'webpack -p' to assemble and minify frontend assets..."
./node_modules/webpack/bin/webpack.js -p
fi &&
echo "Running 'webpack -p' to assemble and minify frontend assets..."
./node_modules/webpack/bin/webpack.js -p &&
if [ -f resources/sample-dataset.db.mv.db ]; then
echo "Sample Dataset already generated."
......
......@@ -21,8 +21,8 @@ test:
# 2) runs Eastwood linter
# 3) Bikeshed linter
# 4) runs JS linter + JS test
# 5) runs ./build-uberjar
- case $CIRCLE_NODE_INDEX in 0) MB_TEST_DATASETS=h2,mongo,postgres lein test ;; 1) MB_TEST_DATASETS=h2,mysql MB_DB_TYPE=postgres MB_DB_DBNAME=circle_test MB_DB_PORT=5432 MB_DB_USER=ubuntu MB_DB_HOST=localhost lein test ;; 2) lein eastwood ;; 3) lein bikeshed --max-line-length 240 ;; 4) npm install && npm run lint && npm run build && npm run test ;; 5) CI_DISABLE_WEBPACK_MINIFICATION=1 ./build-uberjar ;; esac:
# 5) runs lein uberjar. (We don't run build-uberjar because we're not really concerned about `npm install` (etc) in this test, which runs elsewhere)
- case $CIRCLE_NODE_INDEX in 0) MB_TEST_DATASETS=h2,mongo,postgres lein test ;; 1) MB_TEST_DATASETS=h2,mysql MB_DB_TYPE=postgres MB_DB_DBNAME=circle_test MB_DB_PORT=5432 MB_DB_USER=ubuntu MB_DB_HOST=localhost lein test ;; 2) lein eastwood ;; 3) lein bikeshed --max-line-length 240 ;; 4) npm install && npm run lint && npm run build && npm run test ;; 5) lein uberjar ;; esac:
parallel: true
deployment:
master:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment