diff --git a/circle.yml b/circle.yml index 2edd68dd..0b9d66b1 100644 --- a/circle.yml +++ b/circle.yml @@ -22,11 +22,14 @@ dependencies: test: pre: # mkdir lint reports - - mkdir -p $CIRCLE_TEST_REPORTS/lint + - mkdir -p $CIRCLE_TEST_REPORTS/lint: + parallel: true # mkdir test reports - - mkdir -p $CIRCLE_TEST_REPORTS/test + - mkdir -p $CIRCLE_TEST_REPORTS/test: + parallel: true # mkdir coverage artifact folders - - ls -1 packages | xargs -I % mkdir -p $CIRCLE_ARTIFACTS/"%" + - ls -1 packages | xargs -I % mkdir -p $CIRCLE_ARTIFACTS/"%": + parallel: true override: # lint - ./scripts/parallel-run --cmd="lint-ci": @@ -48,7 +51,6 @@ deployment: - sudo chmod +x /usr/local/bin/docker-compose # install and setup triton - yarn global add triton@4.15.0 || cat /home/ubuntu/.yarn-config/global/yarn-error.log - development: branch: master commands: diff --git a/package.json b/package.json index e1076b60..f80d830d 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "lint": "redrun -s lint:*", "test": "lerna run test", "lint-ci": "eslint scripts/* --format junit --output-file $CIRCLE_TEST_REPORTS/lint/container-pilot-dashboard.xml", - "test-ci": "exit 0", + "test-ci": "echo 0", "clean": "lerna clean --yes", "bootstrap": "lerna bootstrap", "dev": "redrun -p dev:*", diff --git a/packages/babel-preset/package.json b/packages/babel-preset/package.json index 706ccde5..2e692c12 100644 --- a/packages/babel-preset/package.json +++ b/packages/babel-preset/package.json @@ -7,8 +7,8 @@ "scripts": { "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/babel-preset-joyent-portal.xml", - "test": "exit 0", - "test-ci": "exit 0" + "test": "echo 0", + "test-ci": "echo 0" }, "dependencies": { "babel-preset-react-app": "^3.0.0" diff --git a/packages/cloudapi-gql/package.json b/packages/cloudapi-gql/package.json index e66637ec..82d7a96a 100644 --- a/packages/cloudapi-gql/package.json +++ b/packages/cloudapi-gql/package.json @@ -8,8 +8,8 @@ "scripts": { "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/cloudapi-gql.xml", - "test": "exit 0", - "test-ci": "exit 0", + "test": "echo 0", + "test-ci": "echo 0", "start": "node src/index.js" }, "dependencies": { diff --git a/packages/cp-frontend/package.json b/packages/cp-frontend/package.json index 0d2c9364..0f5348ab 100644 --- a/packages/cp-frontend/package.json +++ b/packages/cp-frontend/package.json @@ -8,14 +8,14 @@ "scripts": { "start": "PORT=3069 react-scripts start", "build": "react-scripts build", - "lint:css": "exit 0", + "lint:css": "echo 0", "lint:js": "eslint . --fix", "lint": "redrun -s lint:*", - "lint-ci:css": "exit 0", + "lint-ci:css": "echo 0", "lint-ci:js": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/cp-frontend.xml", "lint-ci": "redrun -p lint-ci:*", - "test": "exit 0", - "test-ci": "exit 0", + "test": "echo 0", + "test-ci": "echo 0", "postinstall": "node scripts/postinstall" }, "dependencies": { diff --git a/packages/cp-frontend/scripts/webpack.config.dev.js b/packages/cp-frontend/scripts/webpack.config.dev.js index dba4ec78..43815c0a 100644 --- a/packages/cp-frontend/scripts/webpack.config.dev.js +++ b/packages/cp-frontend/scripts/webpack.config.dev.js @@ -1,12 +1,9 @@ const fs = require('fs'); const path = require('path'); -const paths = require('./paths'); const originalConfig = require('./webpack.config.dev.original'); const FRONTEND_ROOT = process.cwd(); const FRONTEND = path.join(FRONTEND_ROOT, 'src'); -const STATIC = path.join(FRONTEND_ROOT, 'static'); -const ESLINT = path.join(FRONTEND_ROOT, '.eslintrc'); const rules = originalConfig.module.rules.reduce((loaders, loader, index) => { if (index === 3) { diff --git a/packages/cp-frontend/src/components/layout/container.js b/packages/cp-frontend/src/components/layout/container.js index 2dbd68ad..86c2715d 100644 --- a/packages/cp-frontend/src/components/layout/container.js +++ b/packages/cp-frontend/src/components/layout/container.js @@ -1,6 +1,4 @@ -import styled from 'styled-components'; import { Grid } from 'react-styled-flexboxgrid'; - import { breakpoints } from 'joyent-ui-toolkit'; export default Grid.extend` diff --git a/packages/cp-frontend/src/components/navigation/menu.js b/packages/cp-frontend/src/components/navigation/menu.js index 6eb9855a..8dc89a9d 100644 --- a/packages/cp-frontend/src/components/navigation/menu.js +++ b/packages/cp-frontend/src/components/navigation/menu.js @@ -2,7 +2,6 @@ import React from 'react'; import PropTypes from 'prop-types'; -import styled from 'styled-components'; import { NavLink } from 'react-router-dom'; import remcalc from 'remcalc'; diff --git a/packages/cp-frontend/src/containers/deployment-groups/list.js b/packages/cp-frontend/src/containers/deployment-groups/list.js index bad38ab5..0a9506b0 100644 --- a/packages/cp-frontend/src/containers/deployment-groups/list.js +++ b/packages/cp-frontend/src/containers/deployment-groups/list.js @@ -75,7 +75,6 @@ const DeploymentGroupList = ({ DeploymentGroupList.propTypes = { deploymentGroups: PropTypes.arrayOf( PropTypes.shape({ - id: PropTypes.string, id: PropTypes.string, name: PropTypes.string }) diff --git a/packages/cp-frontend/src/state/reducers/ui.js b/packages/cp-frontend/src/state/reducers/ui.js index 17842def..23302950 100644 --- a/packages/cp-frontend/src/state/reducers/ui.js +++ b/packages/cp-frontend/src/state/reducers/ui.js @@ -28,8 +28,6 @@ export default handleActions( quickActions } }; - - return state; } }, {} diff --git a/packages/cp-frontend/src/state/store.js b/packages/cp-frontend/src/state/store.js index 84ccc1f1..01778ee3 100644 --- a/packages/cp-frontend/src/state/store.js +++ b/packages/cp-frontend/src/state/store.js @@ -1,5 +1,5 @@ import { createStore, combineReducers, applyMiddleware, compose } from 'redux'; -import { enableBatching } from 'redux-batched-actions'; +// import { enableBatching } from 'redux-batched-actions'; import { ApolloClient, createNetworkInterface } from 'react-apollo'; import state from './state'; import { ui } from './reducers'; diff --git a/packages/cp-gql-mock-server/package.json b/packages/cp-gql-mock-server/package.json index ad7d1560..8122775c 100644 --- a/packages/cp-gql-mock-server/package.json +++ b/packages/cp-gql-mock-server/package.json @@ -8,8 +8,8 @@ "scripts": { "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/cp-gql-mock-server.xml", - "test": "exit 0", - "test-ci": "exit 0", + "test": "echo 0", + "test-ci": "echo 0", "start": "node src/index.js", "dev": "nodemon src/index.js" }, diff --git a/packages/cp-gql-schema/package.json b/packages/cp-gql-schema/package.json index b19d2593..aaff9399 100644 --- a/packages/cp-gql-schema/package.json +++ b/packages/cp-gql-schema/package.json @@ -8,8 +8,8 @@ "scripts": { "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/cp-gql-schema.xml", - "test": "exit 0", - "test-ci": "exit 0" + "test": "echo 0", + "test-ci": "echo 0" }, "dependencies": {}, "devDependencies": { diff --git a/packages/cp-rdb-bootstrap/package.json b/packages/cp-rdb-bootstrap/package.json index 765f784c..cc0a26e6 100644 --- a/packages/cp-rdb-bootstrap/package.json +++ b/packages/cp-rdb-bootstrap/package.json @@ -7,8 +7,8 @@ "scripts": { "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/cp-rdb-bootstrap.xml", - "test": "exit 0", - "test-ci": "exit 0" + "test": "echo 0", + "test-ci": "echo 0" }, "devDependencies": { "eslint": "^3.19.0", diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json index 6f256ea6..c0695363 100644 --- a/packages/eslint-config/package.json +++ b/packages/eslint-config/package.json @@ -7,8 +7,8 @@ "scripts": { "lint": "eslint . --fix", "lint-ci": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/eslint-config-joyent-portal.xml", - "test": "exit 0", - "test-ci": "exit 0" + "test": "echo 0", + "test-ci": "echo 0" }, "peerDependencies": { "babel-eslint": "^7.2.3", diff --git a/packages/normalized-styled-components/package.json b/packages/normalized-styled-components/package.json index 3f8eb38f..a6b45342 100644 --- a/packages/normalized-styled-components/package.json +++ b/packages/normalized-styled-components/package.json @@ -18,8 +18,8 @@ "module": "dist/normalized-styled-components.es.js", "entry": "src/index.js", "scripts": { - "lint:css": "exit 0", - "lint-ci:css": "exit 0", + "lint:css": "echo 0", + "lint-ci:css": "echo 0", "lint:js": "eslint . --fix", "lint-ci:js": "eslint . --format junit --output-file $CIRCLE_TEST_REPORTS/lint/normalized-styled-components.xml", "lint": "redrun -s lint:*", diff --git a/packages/normalized-styled-components/test/__snapshots__/index.js.snap b/packages/normalized-styled-components/test/__snapshots__/index.js.snap index b256c254..bd4f1669 100644 --- a/packages/normalized-styled-components/test/__snapshots__/index.js.snap +++ b/packages/normalized-styled-components/test/__snapshots__/index.js.snap @@ -301,12 +301,12 @@ exports[`renders correctly 1`] = ` `; exports[`renders