From c4ee2d73865a1444c079b9e2836b7630a0adf03e Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Sun, 12 Nov 2017 22:17:18 -0500 Subject: Switch over to Lerna + Yarn Workspaces setup for a mono-repo approach --- circle.yml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 circle.yml (limited to 'circle.yml') diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 3dc00bd03..000000000 --- a/circle.yml +++ /dev/null @@ -1,23 +0,0 @@ -machine: - node: - version: 6.5.0 - environment: - CONTRACTS_COMMIT_HASH: '78fe8dd' - PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" - -dependencies: - override: - - yarn - cache_directories: - - ~/.cache/yarn - -test: - override: - - wget https://s3.amazonaws.com/testrpc-shapshots/${CONTRACTS_COMMIT_HASH}.zip - - unzip ${CONTRACTS_COMMIT_HASH}.zip -d testrpc_snapshot - - npm run testrpc -- --db testrpc_snapshot: - background: true - - yarn test:coverage - - yarn report_test_coverage - - if [ $CIRCLE_BRANCH = "master" ]; then yarn test:umd; fi - - yarn lint -- cgit v1.2.3 From e6482554f59fa36e9466c01c62af026d62d09ea1 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 13 Nov 2017 10:56:22 -0500 Subject: Add circle.yml and move testrpc command to top-level repo --- circle.yml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 circle.yml (limited to 'circle.yml') diff --git a/circle.yml b/circle.yml new file mode 100644 index 000000000..035b2e155 --- /dev/null +++ b/circle.yml @@ -0,0 +1,23 @@ +machine: + node: + version: 6.5.0 + environment: + CONTRACTS_COMMIT_HASH: '78fe8dd' + PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" + +dependencies: + override: + - yarn + cache_directories: + - ~/.cache/yarn + +test: + override: + - wget https://s3.amazonaws.com/testrpc-shapshots/${CONTRACTS_COMMIT_HASH}.zip + - unzip ${CONTRACTS_COMMIT_HASH}.zip -d testrpc_snapshot + - npm run testrpc -- --db testrpc_snapshot: + background: true + - lerna run test:coverage + - lerna run report_test_coverage + - if [ $CIRCLE_BRANCH = "master" ]; then lerna run test:umd; fi + - lerna run lint -- cgit v1.2.3 From 6a763497302b2dc431287f70aa728e63856ff143 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 13 Nov 2017 11:09:46 -0500 Subject: Install older version of yarn --- circle.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'circle.yml') diff --git a/circle.yml b/circle.yml index 035b2e155..c22d03b08 100644 --- a/circle.yml +++ b/circle.yml @@ -2,12 +2,14 @@ machine: node: version: 6.5.0 environment: + YARN_VERSION: 0.28.4 CONTRACTS_COMMIT_HASH: '78fe8dd' PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" dependencies: override: - - yarn + - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION + - yarn install --pure-lockfile cache_directories: - ~/.cache/yarn -- cgit v1.2.3 From 2ae47d64b75f9bb42b0ce1b5be7cd9b3c1b4cf83 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 13 Nov 2017 11:09:56 -0500 Subject: use yarn instead of lerna --- circle.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'circle.yml') diff --git a/circle.yml b/circle.yml index c22d03b08..a2704568e 100644 --- a/circle.yml +++ b/circle.yml @@ -19,7 +19,7 @@ test: - unzip ${CONTRACTS_COMMIT_HASH}.zip -d testrpc_snapshot - npm run testrpc -- --db testrpc_snapshot: background: true - - lerna run test:coverage - - lerna run report_test_coverage - - if [ $CIRCLE_BRANCH = "master" ]; then lerna run test:umd; fi - - lerna run lint + - yarn test:coverage + - yarn report_test_coverage + - if [ $CIRCLE_BRANCH = "master" ]; then yarn test:umd; fi + - yarn lint -- cgit v1.2.3 From a246702511710a70360f4764277ee375feec5f7a Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 13 Nov 2017 11:20:07 -0500 Subject: Use lerna --- circle.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'circle.yml') diff --git a/circle.yml b/circle.yml index a2704568e..6466a2aab 100644 --- a/circle.yml +++ b/circle.yml @@ -19,7 +19,7 @@ test: - unzip ${CONTRACTS_COMMIT_HASH}.zip -d testrpc_snapshot - npm run testrpc -- --db testrpc_snapshot: background: true - - yarn test:coverage - - yarn report_test_coverage - - if [ $CIRCLE_BRANCH = "master" ]; then yarn test:umd; fi - - yarn lint + - ./node_modules/lerna/bin/lerna run test:coverage + - ./node_modules/lerna/bin/lerna run report_test_coverage + - if [ $CIRCLE_BRANCH = "master" ]; then ./node_modules/lerna/bin/lerna run test:umd; fi + - ./node_modules/lerna/bin/lerna run lint -- cgit v1.2.3 From 4f3b9dc61a7239712b57e6bb9971dc62b39883f6 Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 13 Nov 2017 11:22:31 -0500 Subject: leave out yarn version peg --- circle.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'circle.yml') diff --git a/circle.yml b/circle.yml index 6466a2aab..134251a9d 100644 --- a/circle.yml +++ b/circle.yml @@ -2,14 +2,12 @@ machine: node: version: 6.5.0 environment: - YARN_VERSION: 0.28.4 CONTRACTS_COMMIT_HASH: '78fe8dd' PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" dependencies: override: - - curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version $YARN_VERSION - - yarn install --pure-lockfile + - yarn cache_directories: - ~/.cache/yarn -- cgit v1.2.3 From 0b095ce5ce33b410829bfc38b87e24ce27f0ad6a Mon Sep 17 00:00:00 2001 From: Fabio Berger Date: Mon, 13 Nov 2017 11:54:19 -0500 Subject: Upgrade circleci to version 2.0 --- circle.yml | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 circle.yml (limited to 'circle.yml') diff --git a/circle.yml b/circle.yml deleted file mode 100644 index 134251a9d..000000000 --- a/circle.yml +++ /dev/null @@ -1,23 +0,0 @@ -machine: - node: - version: 6.5.0 - environment: - CONTRACTS_COMMIT_HASH: '78fe8dd' - PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin" - -dependencies: - override: - - yarn - cache_directories: - - ~/.cache/yarn - -test: - override: - - wget https://s3.amazonaws.com/testrpc-shapshots/${CONTRACTS_COMMIT_HASH}.zip - - unzip ${CONTRACTS_COMMIT_HASH}.zip -d testrpc_snapshot - - npm run testrpc -- --db testrpc_snapshot: - background: true - - ./node_modules/lerna/bin/lerna run test:coverage - - ./node_modules/lerna/bin/lerna run report_test_coverage - - if [ $CIRCLE_BRANCH = "master" ]; then ./node_modules/lerna/bin/lerna run test:umd; fi - - ./node_modules/lerna/bin/lerna run lint -- cgit v1.2.3