Skip to content

Switch from Yarn to NPM #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkucharz merged 19 commits into from
Jan 27, 2018
Merged

Switch from Yarn to NPM #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
a22aca9
fix()
mkucharz Jan 25, 2018
277203f
fix()
mkucharz Jan 25, 2018
2d41c4d
fix()
mkucharz Jan 25, 2018
2f1ee62
fix()
mkucharz Jan 25, 2018
f34e0d5
fix(): correct cli verion for registry
mkucharz Jan 25, 2018
824523d
chore(): getting rid of yarn
mkucharz Jan 25, 2018
42bd0f0
fix()
mkucharz Jan 25, 2018
1495c00
chore(): adding package-lock
mkucharz Jan 25, 2018
0c37193
fix(): yarn -> npm
mkucharz Jan 25, 2018
4ef3c02
fix(cli:e2e:instance): skiping empty instance list
mkucharz Jan 25, 2018
5381345
fix(): npm -> yarn
mkucharz Jan 25, 2018
2dc7b60
fix(): typo
mkucharz Jan 25, 2018
d933c1c
chore(): yarn -> npm
mkucharz Jan 25, 2018
00cff2e
fix(): cli version
mkucharz Jan 25, 2018
6b75e9a
chore(): invalidate cache
mkucharz Jan 25, 2018
677af81
fix(): remove registry cache
mkucharz Jan 25, 2018
984146a
fix(): bootstrap
mkucharz Jan 25, 2018
fbc558d
fix(): direct access to cli
mkucharz Jan 25, 2018
94acece
fix(): paths
mkucharz Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 77 additions & 78 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,145 +13,144 @@ jobs:
# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
- v1-dependencies
- v3-dependencies-{{ checksum "package.json" }}
- v3-dependencies

- restore_cache:
keys:
- v1-dependencies-cli-{{ checksum "packages/cli/package.json" }}
- v1-dependencies-cli
- v3-dependencies-cli-{{ checksum "packages/cli/package.json" }}
- v3-dependencies-cli

- restore_cache:
keys:
- v1-dependencies-core-{{ checksum "packages/lib-js-core/package.json" }}
- v1-dependencies-core
- v3-dependencies-core-{{ checksum "packages/lib-js-core/package.json" }}
- v3-dependencies-core

- restore_cache:
keys:
- v1-dependencies-client-{{ checksum "packages/lib-js-client/package.json" }}
- v1-dependencies-client
- v3-dependencies-client-{{ checksum "packages/lib-js-client/package.json" }}
- v3-dependencies-client

- restore_cache:
keys:
- v1-dependencies-validate-{{ checksum "packages/lib-js-validate/package.json" }}
- v1-dependencies-validate
- v3-dependencies-validate-{{ checksum "packages/lib-js-validate/package.json" }}
- v3-dependencies-validate

- restore_cache:
keys:
- v1-dependencies-test-{{ checksum "packages/lib-js-test/package.json" }}
- v1-dependencies-test
- v3-dependencies-test-{{ checksum "packages/lib-js-test/package.json" }}
- v3-dependencies-test

- restore_cache:
keys:
- v1-dependencies-template-project-empty-{{ checksum "packages/template-project-empty/package.json" }}
- v1-dependencies-template-project-empty
- v3-dependencies-template-project-empty-{{ checksum "packages/template-project-empty/package.json" }}
- v3-dependencies-template-project-empty

- restore_cache:
keys:
- v1-dependencies-template-project-hello-{{ checksum "packages/template-project-hello/package.json" }}
- v1-dependencies-template-project-hello
- v3-dependencies-template-project-hello-{{ checksum "packages/template-project-hello/package.json" }}
- v3-dependencies-template-project-hello

- restore_cache:
keys:
- v1-dependencies-template-socket-es6-{{ checksum "packages/template-socket-es6/package.json" }}
- v1-dependencies-template-socket-es6
- v3-dependencies-template-socket-es6-{{ checksum "packages/template-socket-es6/package.json" }}
- v3-dependencies-template-socket-es6

- restore_cache:
keys:
- v1-dependencies-registry-organization-{{ checksum "packages/registry/syncano/organization/package.json" }}
- v1-dependencies-registry-organization
- v3-dependencies-registry-organization-{{ checksum "packages/registry/syncano/organization/package.json" }}
- v3-dependencies-registry-organization

- restore_cache:
keys:
- v1-dependencies-registry-registry-{{ checksum "packages/registry/syncano/registry/package.json" }}
- v1-dependencies-registry-registry
- v3-dependencies-registry-registry-{{ checksum "packages/registry/syncano/registry/package.json" }}
- v3-dependencies-registry-registry

- restore_cache:
keys:
- v1-dependencies-test-tools-{{ checksum "packages/test-tools/package.json" }}
- v1-dependencies-test-tools
- v3-dependencies-test-tools-{{ checksum "packages/test-tools/package.json" }}
- v3-dependencies-test-tools

- restore_cache:
keys:
- v1-dependencies-registry-{{ checksum "packages/registry/package.json" }}
- v1-dependencies-registry
- v3-dependencies-registry-{{ checksum "packages/registry/package.json" }}
- v3-dependencies-registry

- run: yarn install
- run: yarn run bootstrap
- run: npm install
- run: npm run bootstrap

- save_cache:
paths:
- node_modules
- .yarn-cache
key: v1-dependencies-{{ checksum "package.json" }}
key: v3-dependencies-{{ checksum "package.json" }}

- save_cache:
paths:
- packages/cli/node_modules
key: v1-dependencies-cli-{{ checksum "packages/cli/package.json" }}
key: v3-dependencies-cli-{{ checksum "packages/cli/package.json" }}

- save_cache:
paths:
- packages/lib-js-core/node_modules
key: v1-dependencies-core-{{ checksum "packages/lib-js-core/package.json" }}
key: v3-dependencies-core-{{ checksum "packages/lib-js-core/package.json" }}

- save_cache:
paths:
- packages/lib-js-client/node_modules
key: v1-dependencies-client-{{ checksum "packages/lib-js-client/package.json" }}
key: v3-dependencies-client-{{ checksum "packages/lib-js-client/package.json" }}

- save_cache:
paths:
- packages/lib-js-validate/node_modules
key: v1-dependencies-validate-{{ checksum "packages/lib-js-validate/package.json" }}
key: v3-dependencies-validate-{{ checksum "packages/lib-js-validate/package.json" }}

- save_cache:
paths:
- packages/lib-js-test/node_modules
key: v1-dependencies-test-{{ checksum "packages/lib-js-test/package.json" }}
key: v3-dependencies-test-{{ checksum "packages/lib-js-test/package.json" }}

- save_cache:
paths:
- packages/template-project-empty/node_modules
key: v1-dependencies-template-project-empty-{{ checksum "packages/template-project-empty/package.json" }}
key: v3-dependencies-template-project-empty-{{ checksum "packages/template-project-empty/package.json" }}

- save_cache:
paths:
- packages/template-project-empty/node_modules
key: v1-dependencies-template-project-empty-{{ checksum "packages/template-project-empty/package.json" }}
key: v3-dependencies-template-project-empty-{{ checksum "packages/template-project-empty/package.json" }}

- save_cache:
paths:
- packages/template-project-hello/node_modules
key: v1-dependencies-template-project-hello-{{ checksum "packages/template-project-hello/package.json" }}
key: v3-dependencies-template-project-hello-{{ checksum "packages/template-project-hello/package.json" }}

- save_cache:
paths:
- packages/template-socket-es6/node_modules
key: v1-dependencies-template-socket-es6-{{ checksum "packages/template-socket-es6/package.json" }}
key: v3-dependencies-template-socket-es6-{{ checksum "packages/template-socket-es6/package.json" }}

- save_cache:
paths:
- packages/registry/syncano/organization/node_modules
key: v1-dependencies-registry-organization-{{ checksum "packages/registry/syncano/organization/package.json" }}
key: v3-dependencies-registry-organization-{{ checksum "packages/registry/syncano/organization/package.json" }}

- save_cache:
paths:
- packages/registry/syncano/registry/node_modules
key: v1-dependencies-registry-registry-{{ checksum "packages/registry/syncano/registry/package.json" }}
key: v3-dependencies-registry-registry-{{ checksum "packages/registry/syncano/registry/package.json" }}

- save_cache:
paths:
- packages/registry/node_modules
key: v1-dependencies-registry-{{ checksum "packages/registry/package.json" }}
key: v3-dependencies-registry-{{ checksum "packages/registry/package.json" }}

- save_cache:
paths:
- packages/test-tools/node_modules
key: v1-dependencies-test-tools-{{ checksum "packages/test-tools/package.json" }}
key: v3-dependencies-test-tools-{{ checksum "packages/test-tools/package.json" }}

- save_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
paths:
- ~/repo

Expand All @@ -164,9 +163,9 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run test:unit
- run: yarn run report:coverage
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run test:unit
- run: npm run report:coverage

test_e2e_client:
name: E2E Tests
Expand All @@ -177,8 +176,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run test:e2e
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run test:e2e

test_e2e_validate:
name: E2E Tests
Expand All @@ -189,8 +188,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run test:e2e
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run test:e2e

test_e2e_core:
name: E2E Tests
Expand All @@ -201,8 +200,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run test:e2e
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run test:e2e

test_e2e_registry:
name: E2E Tests
Expand All @@ -213,8 +212,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: SYNCANO_SOCKET_REGISTRY_INSTANCE=${REGISTRY_TEST_SYNCANO_PROJECT_INSTANCE}-${CIRCLE_SHA1} yarn run test:e2e:registry
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: SYNCANO_SOCKET_REGISTRY_INSTANCE=${REGISTRY_TEST_SYNCANO_PROJECT_INSTANCE}-${CIRCLE_SHA1} npm run test:e2e:registry

test_e2e_hosting:
name: E2E Tests
Expand All @@ -225,8 +224,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run test:e2e:hosting
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run test:e2e:hosting

test_e2e_socket:
name: E2E Tests
Expand All @@ -237,8 +236,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run test:e2e:socket
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run test:e2e:socket

test_e2e_anonymous:
name: E2E Tests
Expand All @@ -249,8 +248,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run test:e2e:anonymous
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run test:e2e:anonymous

test_e2e_instance:
name: E2E Tests
Expand All @@ -261,8 +260,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run test:e2e:instance
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run test:e2e:instance

test_e2e_deploy:
name: E2E Tests
Expand All @@ -273,8 +272,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run test:e2e:deploy
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run test:e2e:deploy

test_e2e_config:
name: E2E Tests
Expand All @@ -285,8 +284,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run test:e2e:config
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run test:e2e:config

test_lint:
name: Linter
Expand All @@ -297,8 +296,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run lint
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run lint

deploy_docs:
name: Deploying Docs
Expand All @@ -309,7 +308,7 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: echo 'export SYNCANO_AUTH_KEY=${CANARY_SYNCANO_AUTH_KEY}' >> $BASH_ENV
- run: echo 'export SYNCANO_PROJECT_INSTANCE=${CANARY_SYNCANO_PROJECT_INSTANCE}' >> $BASH_ENV
- run: node packages/cli/lib/cli.js deploy
Expand All @@ -326,7 +325,7 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: echo 'export REGISTRY_TEST_SYNCANO_PROJECT_INSTANCE=${REGISTRY_TEST_SYNCANO_PROJECT_INSTANCE}-${CIRCLE_SHA1}' >> $BASH_ENV
- run: sh ./bin/deploy-staging

Expand All @@ -339,7 +338,7 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: sh ./bin/deploy

delete_registry:
Expand All @@ -351,8 +350,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: SYNCANO_AUTH_KEY=${REGISTRY_TEST_SYNCANO_AUTH_KEY} npx s instance delete ${REGISTRY_TEST_SYNCANO_PROJECT_INSTANCE}-${CIRCLE_SHA1}
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: SYNCANO_AUTH_KEY=${REGISTRY_TEST_SYNCANO_AUTH_KEY} ../cli/lib/cli.js instance delete ${REGISTRY_TEST_SYNCANO_PROJECT_INSTANCE}-${CIRCLE_SHA1}

publish:
name: Publish packages to NPM
Expand All @@ -363,9 +362,9 @@ jobs:

steps:
- restore_cache:
key: v1-repo-{{ .Environment.CIRCLE_SHA1 }}
key: v3-repo-{{ .Environment.CIRCLE_SHA1 }}
- run: npx npm-cli-login -u $NPM_USER -p $NPM_PASS -e $NPM_EMAIL -s syncano
- run: yarn run changelog
- run: npm run changelog
- run: npx lerna publish --canary --yes

codecov:
Expand All @@ -377,8 +376,8 @@ jobs:

steps:
- restore_cache:
key: v1-repo-units-{{ .Environment.CIRCLE_SHA1 }}
- run: yarn run report:coverage
key: v3-repo-units-{{ .Environment.CIRCLE_SHA1 }}
- run: npm run report:coverage

workflows:
version: 2
Expand Down
Loading