diff --git a/circle.yml b/circle.yml index 01474436..6d4c2676 100644 --- a/circle.yml +++ b/circle.yml @@ -22,8 +22,12 @@ dependencies: test: pre: + # mkdir lint reports - mkdir -p $CIRCLE_TEST_REPORTS/lint + # mkdir test reports - mkdir -p $CIRCLE_TEST_REPORTS/test + # mkdir coverage artifact folders + - ls -1 packages | xargs -I % mkdir -p $CIRCLE_ARTIFACTS/"%" override: # lint - yarn run lint-ci diff --git a/packages/docker-compose-client/package.json b/packages/docker-compose-client/package.json index fde0c15f..33ae6630 100644 --- a/packages/docker-compose-client/package.json +++ b/packages/docker-compose-client/package.json @@ -8,7 +8,7 @@ "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/docker-compose-client.xml", "test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava", - "test-ci": "cross-env NODE_ENV=test ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/docker-compose-client.xml" + "test-ci": "cross-env NODE_ENV=test nyc --report-dir=$CIRCLE_ARTIFACTS/docker-compose-client --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/docker-compose-client.xml" }, "dependencies": { "apr-awaitify": "^1.0.4", diff --git a/packages/normalized-styled-components/package.json b/packages/normalized-styled-components/package.json index a04a0eee..3f8eb38f 100644 --- a/packages/normalized-styled-components/package.json +++ b/packages/normalized-styled-components/package.json @@ -25,7 +25,7 @@ "lint": "redrun -s lint:*", "lint-ci": "redrun -p lint-ci:*", "test": "bup && cross-env NODE_ENV=test jest --coverage", - "test-ci": "cross-env NODE_ENV=test JEST_JUNIT_OUTPUT=$CIRCLE_TEST_REPORTS/test/normalized-styled-components.xml jest --testResultsProcessor='./node_modules/jest-junit'", + "test-ci": "cross-env NODE_ENV=test JEST_JUNIT_OUTPUT=$CIRCLE_TEST_REPORTS/test/normalized-styled-components.xml jest --coverage --coverageDirectory=$CIRCLE_ARTIFACTS/normalized-styled-components --testResultsProcessor='./node_modules/jest-junit'", "build": "bup", "prepublish": "redrun build" }, diff --git a/packages/pseudo-json-ast/package.json b/packages/pseudo-json-ast/package.json index af98d159..2ecefbe3 100644 --- a/packages/pseudo-json-ast/package.json +++ b/packages/pseudo-json-ast/package.json @@ -25,7 +25,7 @@ "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/pseudo-json-ast.xml", "test:run": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava", - "test-ci:run": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/pseudo-json-ast.xml", + "test-ci:run": "cross-env NODE_ENV=test nyc --report-dir=$CIRCLE_ARTIFACTS/pseudo-json-ast --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/pseudo-json-ast.xml", "test": "redrun -s build test:run", "test-ci": "redrun -s build test-ci:run", "build": "bup", diff --git a/packages/pseudo-yaml-ast/package.json b/packages/pseudo-yaml-ast/package.json index ccef879e..561e0877 100644 --- a/packages/pseudo-yaml-ast/package.json +++ b/packages/pseudo-yaml-ast/package.json @@ -27,7 +27,7 @@ "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/pseudo-yaml-ast.xml", "test:run": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava", - "test-ci:run": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/pseudo-yaml-ast.xml", + "test-ci:run": "cross-env NODE_ENV=test nyc --report-dir=$CIRCLE_ARTIFACTS/pseudo-yaml-ast --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/pseudo-yaml-ast.xml", "test": "redrun build test:run", "test-ci": "redrun build test-ci:run", "build": "bup", diff --git a/packages/remcalc/package.json b/packages/remcalc/package.json index 06f69a8c..4e429b01 100644 --- a/packages/remcalc/package.json +++ b/packages/remcalc/package.json @@ -17,7 +17,7 @@ "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/remcalc.xml", "test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava", - "test-ci": "cross-env NODE_ENV=test ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/remcalc.xml" + "test-ci": "cross-env NODE_ENV=test nyc --report-dir=$CIRCLE_ARTIFACTS/remcalc --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/remcalc.xml" }, "dependencies": { "lodash.flatten": "^4.4.0" diff --git a/packages/rnd-id/package.json b/packages/rnd-id/package.json index 3088b010..f9b90a78 100644 --- a/packages/rnd-id/package.json +++ b/packages/rnd-id/package.json @@ -13,7 +13,7 @@ "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/rnd-id.xml", "test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava", - "test-ci": "cross-env NODE_ENV=test ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/rnd-id.xml" + "test-ci": "cross-env NODE_ENV=test nyc --report-dir=$CIRCLE_ARTIFACTS/rnd-id --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/rnd-id.xml" }, "dependencies": { "random-natural": "^1.0.3" diff --git a/packages/styled-is/package.json b/packages/styled-is/package.json index 02f51c92..7670b37c 100644 --- a/packages/styled-is/package.json +++ b/packages/styled-is/package.json @@ -20,7 +20,7 @@ "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/styled-is.xml", "test:run": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava", - "test-ci:run": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/styled-is.xml", + "test-ci:run": "cross-env NODE_ENV=test nyc --report-dir=$CIRCLE_ARTIFACTS/styled-is --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/styled-is.xml", "test": "redrun -s build test:run", "test-ci": "redrun -s build test-ci:run", "build": "bup", diff --git a/packages/unitcalc/package.json b/packages/unitcalc/package.json index fded4a71..3a60efb4 100644 --- a/packages/unitcalc/package.json +++ b/packages/unitcalc/package.json @@ -19,7 +19,7 @@ "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/unitcalc.xml", "test": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava", - "test-ci": "cross-env NODE_ENV=test nyc --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/unitcalc.xml" + "test-ci": "cross-env NODE_ENV=test nyc --report-dir=$CIRCLE_ARTIFACTS/unitcalc --reporter=lcov --reporter=text ava --tap | tap-xunit > $CIRCLE_TEST_REPORTS/test/unitcalc.xml" }, "dependencies": { "lodash.flatten": "^4.4.0",