Skip to content

Commit

Permalink
Fix deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
domoritz committed Apr 24, 2017
1 parent 4ee9da3 commit fe88c24
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"site": "bundle exec jekyll serve",

"lint": "tslint --project tsconfig.json -c tslint.json --type-check",
"test": "npm run tsc && npm run test:only && npm run lint",
"posttest": "npm run schema && npm run data && npm run mocha:examples",
"test": "npm run tsc && npm run schema && npm run test:only && npm run lint",

This comment has been minimized.

Copy link
@kanitw

kanitw Jun 12, 2017

Member

@domoritz Why did you revert my faster test script?

This comment has been minimized.

Copy link
@domoritz

domoritz via email Jun 13, 2017

Author Member

This comment has been minimized.

Copy link
@kanitw

kanitw Jun 13, 2017

Member

How is it related?

This comment has been minimized.

Copy link
@domoritz

domoritz Jun 13, 2017

Author Member

I think I needed the schema to run the tests.

This comment has been minimized.

Copy link
@kanitw

kanitw Jun 13, 2017

Member

But running test will run posttest and hence produce the schema anyway, so I don't understand why this helps.

This comment has been minimized.

Copy link
@domoritz

domoritz Jun 13, 2017

Author Member

Posttest runs after the test, not before.

This comment has been minimized.

Copy link
@kanitw

kanitw Jun 13, 2017

Member

Yeah, but doesn't only example test (which is in posttest) requires schema?

If so, there is no reason to npm schema before test:only.

FYI, it was working well and fast for me. Moving this before test:only make it super slow! (And is in fact the reason why you come up with your "fast iteration testing" thing.)

This comment has been minimized.

Copy link
@domoritz

domoritz via email Jun 13, 2017

Author Member
"posttest": "npm run data && npm run mocha:examples",
"test:nocompile": "npm run test:only && npm run lint && npm run mocha:examples",
"test:only": "nyc --reporter=html --reporter=text-summary npm run mocha:test",
"test:debug": "npm run pretest && mocha --recursive --debug-brk build/test build/examples",
Expand Down
1 change: 1 addition & 0 deletions scripts/deploy-gh.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash

set -x
set -e

scripts/pre-deploy.sh
Expand Down
5 changes: 4 additions & 1 deletion scripts/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#!/bin/bash

set -x
set -e

scripts/pre-deploy.sh

# 1. NPM PUBLISH

npm run clean
npm run test
npm run build:examples
npm run build
npm run build:examples

# Check if all required files are here
if ! [ -f build/vega-lite.js ]; then
Expand Down
1 change: 1 addition & 0 deletions scripts/pre-deploy.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/bin/bash

set -x
set -e

# define color
Expand Down

0 comments on commit fe88c24

Please sign in to comment.