Skip to content

Commit

Permalink
[Test] Readd deploy requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
damassi committed May 23, 2020
1 parent 996653e commit 4ad68f3
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 7 deletions.
36 changes: 31 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,8 @@ workflows:
project_id: 11

# Pre-staging
- yarn/run:
name: test:jest
script: "jest"
- yarn/jest:
args: --runInBand
requires:
- yarn/workflow-queue

Expand All @@ -131,6 +130,34 @@ workflows:
requires:
- yarn/workflow-queue

# TODO: Disabled due to memory issues. Can we use our workflows above and
# upload coverage that way (similar to reaction). We save a lot of time
# by operating outside of an unnecessary docker context.

# - hokusai/test:
# name: test
# <<: *not_staging_or_release
# post-steps:
# - run: mkdir -p ./coverage ./.nyc_output ./reports
# - run:
# name: Copy jest coverage artifacts
# command: docker cp hokusai_force_1:/app/coverage ./
# when: always
# - codecov/upload:
# file: ./coverage/lcov.info
# - run:
# name: Copy mocha coverage artifacts
# command: docker cp hokusai_force_1:/app/.nyc_output ./
# when: always
# - codecov/upload:
# file: ./.nyc_output/lcov.info
# - run:
# name: Copy coverage reports
# command: docker cp hokusai_force_1:/app/reports ./
# when: always
# - store_test_results:
# path: ./reports

- yarn/update-cache:
<<: *not_staging_or_release
- yarn/type-check:
Expand All @@ -149,8 +176,7 @@ workflows:
name: push-staging-image
<<: *only_master
requires:
# - test
- test:jest
- yarn/jest
- test:mocha
- acceptance
- build
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"cypress": "./node_modules/.bin/cypress open",
"dev": "concurrently --raw --kill-others 'yarn relay --watch' 'scripts.start.sh'",
"integrate": "./scripts/quicklink-to-project.sh",
"jest": "JEST_JUNIT_OUTPUT=reports/junit/js-test-results.xml jest --maxWorkers=2",
"jest": "JEST_JUNIT_OUTPUT=reports/junit/js-test-results.xml jest --runInBand",
"mocha": "scripts/mocha.sh",
"prepare": "patch-package",
"prettier-project": "yarn run prettier-write 'src/**/*.{ts,tsx,js,jsx}'",
Expand Down
2 changes: 1 addition & 1 deletion scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
set -ex

yarn jest
yarn mocha $(find src -name '*.test.*')
yarn test:mocha

0 comments on commit 4ad68f3

Please sign in to comment.