othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix path; split PR and Merge unit tests into separate jobs

Browse Source
This commit is contained in:
dannyrb 2019-08-05 13:04:27 -04:00
parent 7c043b46b4
commit b2dfb6e0f7
1 changed files with 65 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
.circleci/config.yml
View File

@ -18,8 +18,9 @@ defaults: &defaults
working_directory: ~/repo working_directory: ~/repo
jobs: jobs:
unit_tests: PR_UNIT_TESTS:
<<: *defaults <<: *defaults
steps: steps:
# Enable yarn workspaces # Enable yarn workspaces
- run: yarn config set workspaces-experimental true - run: yarn config set workspaces-experimental true
@ -28,7 +29,6 @@ jobs:
- checkout: - checkout:
post: post:
- git fetch --all - git fetch --all
- restore_cache: - restore_cache:
name: Restore Yarn and Cypress Package Cache name: Restore Yarn and Cypress Package Cache
keys: keys:
@ -36,20 +36,16 @@ jobs:
- yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }} - yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
- yarn-packages-v1-{{ .Branch }}- - yarn-packages-v1-{{ .Branch }}-
- yarn-packages-v1- - yarn-packages-v1-
- run: - run:
name: Install Dependencies name: Install Dependencies
command: yarn install --frozen-lockfile command: yarn install --frozen-lockfile
- save_cache: - save_cache:
name: Save Yarn Package Cache name: Save Yarn Package Cache
paths: paths:
- ~/.cache ## Cache yarn and Cypress - ~/.cache ## Cache yarn and Cypress
key: yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }} key: yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
# Test # RUN TESTS
# TODO: lerna:tests
# https://www.viget.com/articles/using-junit-on-circleci-2-0-with-jest-and-eslint/
- run: - run:
name: "JavaScript Test Suite" name: "JavaScript Test Suite"
command: yarn run test:unit:ci command: yarn run test:unit:ci
@ -58,13 +54,12 @@ jobs:
- run: - run:
name: "VIEWER: Combine report output" name: "VIEWER: Combine report output"
command: | command: |
viewerCov="~/repo/platform/viewer/coverage" viewerCov="/home/circleci/repo/platform/viewer/coverage"
touch "${viewerCov}/reports" touch "${viewerCov}/reports"
cat "${viewerCov}/clover.xml" >> "${viewerCov}/reports" cat "${viewerCov}/clover.xml" >> "${viewerCov}/reports"
echo "\<<\<<\<< EOF" >> "${viewerCov}/reports" echo "\<<\<<\<< EOF" >> "${viewerCov}/reports"
cat "${viewerCov}/lcov.info" >>"${viewerCov}/reports" cat "${viewerCov}/lcov.info" >>"${viewerCov}/reports"
echo "\<<\<<\<< EOF" >> "${viewerCov}/reports" echo "\<<\<<\<< EOF" >> "${viewerCov}/reports"
- codecov/upload: - codecov/upload:
file: "/home/circleci/repo/platform/viewer/coverage/reports" file: "/home/circleci/repo/platform/viewer/coverage/reports"
flags: "viewer" flags: "viewer"
@ -78,7 +73,65 @@ jobs:
echo "\<<\<<\<< EOF" >> ~/repo/platform/core/coverage/reports echo "\<<\<<\<< EOF" >> ~/repo/platform/core/coverage/reports
cat ~/repo/platform/core/coverage/lcov.info >> ~/repo/platform/core/coverage/reports cat ~/repo/platform/core/coverage/lcov.info >> ~/repo/platform/core/coverage/reports
echo "\<<\<<\<< EOF" >> ~/repo/platform/core/coverage/reports echo "\<<\<<\<< EOF" >> ~/repo/platform/core/coverage/reports
- codecov/upload:
file: "/home/circleci/repo/platform/core/coverage/reports"
flags: "core"
MERGE_UNIT_TESTS:
<<: *defaults
steps:
# Enable yarn workspaces
- run: yarn config set workspaces-experimental true
# Checkout code and ALL Git Tags
- checkout:
post:
- git fetch --all
- restore_cache:
name: Restore Yarn and Cypress Package Cache
keys:
# when lock file changes, use increasingly general patterns to restore cache
- yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
- yarn-packages-v1-{{ .Branch }}-
- yarn-packages-v1-
- run:
name: Install Dependencies
command: yarn install --frozen-lockfile
- save_cache:
name: Save Yarn Package Cache
paths:
- ~/.cache ## Cache yarn and Cypress
key: yarn-packages-v1-{{ .Branch }}-{{ checksum "yarn.lock" }}
# RUN TESTS
- run:
name: "JavaScript Test Suite"
command: yarn run test:unit:ci
# PLATFORM/VIEWER
- run:
name: "VIEWER: Combine report output"
command: |
viewerCov="/home/circleci/repo/platform/viewer/coverage"
touch "${viewerCov}/reports"
cat "${viewerCov}/clover.xml" >> "${viewerCov}/reports"
echo "\<<\<<\<< EOF" >> "${viewerCov}/reports"
cat "${viewerCov}/lcov.info" >>"${viewerCov}/reports"
echo "\<<\<<\<< EOF" >> "${viewerCov}/reports"
- codecov/upload:
file: "/home/circleci/repo/platform/viewer/coverage/reports"
flags: "viewer"
# PLATFORM/CORE
- run:
name: "CORE: Combine report output"
command: |
touch ~/repo/platform/core/coverage/reports
cat ~/repo/platform/core/coverage/clover.xml >> ~/repo/platform/core/coverage/reports
echo "\<<\<<\<< EOF" >> ~/repo/platform/core/coverage/reports
cat ~/repo/platform/core/coverage/lcov.info >> ~/repo/platform/core/coverage/reports
echo "\<<\<<\<< EOF" >> ~/repo/platform/core/coverage/reports
- codecov/upload: - codecov/upload:
file: "/home/circleci/repo/platform/core/coverage/reports" file: "/home/circleci/repo/platform/core/coverage/reports"
flags: "core" flags: "core"
@ -249,7 +302,7 @@ workflows:
# PULL REQUESTS # PULL REQUESTS
pull_requests: pull_requests:
jobs: jobs:
- unit_tests: - PR_UNIT_TESTS:
filters: filters:
branches: branches:
ignore: ignore:
@ -260,13 +313,13 @@ workflows:
# MERGE TO MASTER # MERGE TO MASTER
cut_release: cut_release:
jobs: jobs:
- unit_tests: - MERGE_UNIT_TESTS:
filters: filters:
branches: branches:
only: master only: master
- e2e_test: - e2e_test:
requires: requires:
- unit_tests - MERGE_UNIT_TESTS
# Update NPM # Update NPM
- npm_publish: - npm_publish:
requires: requires: