diff --git a/circle.yml b/circle.yml index 136d49b3a..642c4e8a8 100644 --- a/circle.yml +++ b/circle.yml @@ -47,11 +47,10 @@ test: - source scripts/circle-ci-android-setup.sh && waitForAVD override: - # TODO flow is disabled see t11343811 and 0.25.1 # eslint bot - # - cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; npm run flow --silent -- check --json) | GITHUB_TOKEN="af6ef0d15709bc91d""06a6217a5a826a226fb57b7" CI_USER=$CIRCLE_PROJECT_USERNAME CI_REPO=$CIRCLE_PROJECT_REPONAME PULL_REQUEST_NUMBER=$CIRCLE_PR_NUMBER node bots/code-analysis-bot.js + - cat <(echo eslint; npm run lint --silent -- --format=json; echo flow; npm run flow --silent -- check --json) | GITHUB_TOKEN="af6ef0d15709bc91d""06a6217a5a826a226fb57b7" CI_USER=$CIRCLE_PROJECT_USERNAME CI_REPO=$CIRCLE_PROJECT_REPONAME PULL_REQUEST_NUMBER=$CIRCLE_PR_NUMBER node bots/code-analysis-bot.js # JS tests for dependencies installed with npm3 - # - npm run flow check + - npm run flow -- check - npm test -- --maxWorkers=1 # build app diff --git a/scripts/run-ci-e2e-tests.js b/scripts/run-ci-e2e-tests.js index 8633be8b7..cf3534b64 100644 --- a/scripts/run-ci-e2e-tests.js +++ b/scripts/run-ci-e2e-tests.js @@ -195,12 +195,11 @@ try { exitCode = 1; throw Error(exitCode); } -// TODO disabled while flow 0.25.0 is crashing - // if (exec(`${ROOT}/node_modules/.bin/flow check`).code) { - // echo('Flow check does not pass'); - // exitCode = 1; - // throw Error(exitCode); - // } + if (exec(`${ROOT}/node_modules/.bin/flow check`).code) { + echo('Flow check does not pass'); + exitCode = 1; + throw Error(exitCode); + } } exitCode = 0;