Skip to content

Commit

Permalink
Merge branch 'master' into order-categories
Browse files Browse the repository at this point in the history
* master:
  Do not run flow on CI until this is fixed: flow/flow-bin#138
  Run one-off flow check instead of starting server/watcher.
  Upload flow logs to CI
  Try running flow separately?
  • Loading branch information
jgerigmeyer committed Dec 6, 2018
2 parents 96c5c52 + b1764f6 commit 054bebc
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ jobs:
command: |
. venv/bin/activate
yarn lint
# @@@ We'd like to run `flow` here, but:
# https://github.com/flowtype/flow-bin/issues/138
# - store_artifacts:
# path: /tmp/flow
# destination: flow-logs

test-client:
working_directory: ~/metadeploy
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
"flake8": "flake8 manage.py metadeploy/ config/",
"isort": "isort -rc manage.py metadeploy/ config/",
"black": "black manage.py metadeploy/ config/",
"lint": "npm-run-all -p prettier flake8 -p eslint stylelint flow",
"lint": "npm-run-all -p prettier flake8 -p eslint stylelint",
"test": "jest",
"test:watch": "jest --watch",
"test:coverage": "JEST_JUNIT_OUTPUT='./coverage/junit.xml' jest --ci --runInBand --reporters=default --reporters=jest-junit",
Expand Down

0 comments on commit 054bebc

Please sign in to comment.