From b79f54c044b4fe45ba56be70b0b878b298a418ee Mon Sep 17 00:00:00 2001 From: Benjamin LEVESQUE <14175665+benjlevesque@users.noreply.github.com> Date: Tue, 3 Dec 2019 13:09:08 +0100 Subject: [PATCH 1/5] chore(CI): optimize docker build with caching --- .circleci/config.yml | 283 ++++++++++++++++++++++--------------------- 1 file changed, 142 insertions(+), 141 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 59ad88eeaa..998e92f6dc 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 references: working_directory: &working_directory ~/repo attach_workspace: &attach_workspace - image_name: &image_name 'circleci/python:3.7' + image_name: &image_name "circleci/python:3.7" node_image: &node_image image: circleci/node:10 ipfs_image: &ipfs_image @@ -11,10 +11,10 @@ references: ganache_image: &ganache_image image: trufflesuite/ganache-cli:v6.3.0 command: - - '-l' - - '90000000' - - '-m' - - 'candy maple cake sugar pudding cream honey rich smooth crumble sweet treat' + - "-l" + - "90000000" + - "-m" + - "candy maple cake sugar pudding cream honey rich smooth crumble sweet treat" orbs: gcp-gcr: circleci/gcp-gcr@0.3.0 @@ -28,8 +28,8 @@ jobs: steps: - checkout - run: - name: 'Yarn install' - command: 'yarn install' + name: "Yarn install" + command: "yarn install" - persist_to_workspace: root: *working_directory paths: . @@ -41,8 +41,8 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'lint package.json files' - command: 'yarn run packageJsonLint' + name: "lint package.json files" + command: "yarn run packageJsonLint" test-request-client: docker: - *node_image @@ -52,17 +52,17 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build request-client.js' - command: 'yarn workspace @requestnetwork/request-client.js run build:commonjs' + name: "Build request-client.js" + command: "yarn workspace @requestnetwork/request-client.js run build:commonjs" - run: - name: 'Lint request-client.js' - command: 'yarn workspace @requestnetwork/request-client.js run lint ' + name: "Lint request-client.js" + command: "yarn workspace @requestnetwork/request-client.js run lint " - run: - name: 'Deploy test contract from ethereum-storage' - command: 'yarn workspace @requestnetwork/ethereum-storage run deploy' + name: "Deploy test contract from ethereum-storage" + command: "yarn workspace @requestnetwork/ethereum-storage run deploy" - run: - name: 'Test request-client.js' - command: 'yarn workspace @requestnetwork/request-client.js run test' + name: "Test request-client.js" + command: "yarn workspace @requestnetwork/request-client.js run test" - persist_to_workspace: root: *working_directory paths: @@ -75,14 +75,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build data-access' - command: 'yarn workspace @requestnetwork/data-access run build' + name: "Build data-access" + command: "yarn workspace @requestnetwork/data-access run build" - run: - name: 'Lint data-access' - command: 'yarn workspace @requestnetwork/data-access run lint ' + name: "Lint data-access" + command: "yarn workspace @requestnetwork/data-access run lint " - run: - name: 'Test data-access' - command: 'yarn workspace @requestnetwork/data-access run test' + name: "Test data-access" + command: "yarn workspace @requestnetwork/data-access run test" - persist_to_workspace: root: *working_directory paths: @@ -95,14 +95,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build data-format' - command: 'yarn workspace @requestnetwork/data-format run build' + name: "Build data-format" + command: "yarn workspace @requestnetwork/data-format run build" - run: - name: 'Lint data-format' - command: 'yarn workspace @requestnetwork/data-format run lint' + name: "Lint data-format" + command: "yarn workspace @requestnetwork/data-format run lint" - run: - name: 'Test data-format' - command: 'yarn workspace @requestnetwork/data-format run test' + name: "Test data-format" + command: "yarn workspace @requestnetwork/data-format run test" - persist_to_workspace: root: *working_directory paths: @@ -115,14 +115,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build transaction-manager' - command: 'yarn workspace @requestnetwork/transaction-manager run build' + name: "Build transaction-manager" + command: "yarn workspace @requestnetwork/transaction-manager run build" - run: - name: 'Lint transaction-manager' - command: 'yarn workspace @requestnetwork/transaction-manager run lint' + name: "Lint transaction-manager" + command: "yarn workspace @requestnetwork/transaction-manager run lint" - run: - name: 'Test transaction-manager' - command: 'yarn workspace @requestnetwork/transaction-manager run test' + name: "Test transaction-manager" + command: "yarn workspace @requestnetwork/transaction-manager run test" - persist_to_workspace: root: *working_directory paths: @@ -137,26 +137,26 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build ethereum-storage' - command: 'yarn workspace @requestnetwork/ethereum-storage run build:lib' + name: "Build ethereum-storage" + command: "yarn workspace @requestnetwork/ethereum-storage run build:lib" - run: - name: 'Lint ethereum-storage' - command: 'yarn workspace @requestnetwork/ethereum-storage run lint:lib' + name: "Lint ethereum-storage" + command: "yarn workspace @requestnetwork/ethereum-storage run lint:lib" - run: - name: 'Deploy contracs ethereum-storage' - command: 'yarn workspace @requestnetwork/ethereum-storage run deploy' + name: "Deploy contracs ethereum-storage" + command: "yarn workspace @requestnetwork/ethereum-storage run deploy" - run: - name: 'Test ethereum-storage' - command: 'yarn workspace @requestnetwork/ethereum-storage run test:lib' + name: "Test ethereum-storage" + command: "yarn workspace @requestnetwork/ethereum-storage run test:lib" - run: - name: 'Build smart contracts ethereum-storage' - command: 'yarn workspace @requestnetwork/ethereum-storage run build:sol' + name: "Build smart contracts ethereum-storage" + command: "yarn workspace @requestnetwork/ethereum-storage run build:sol" - run: - name: 'Lint smart contracts ethereum-storage' - command: 'yarn workspace @requestnetwork/ethereum-storage run lint:sol' + name: "Lint smart contracts ethereum-storage" + command: "yarn workspace @requestnetwork/ethereum-storage run lint:sol" - run: - name: 'Test smart contracts ethereum-storage' - command: 'yarn workspace @requestnetwork/ethereum-storage run test:sol' + name: "Test smart contracts ethereum-storage" + command: "yarn workspace @requestnetwork/ethereum-storage run test:sol" - persist_to_workspace: root: *working_directory paths: @@ -169,14 +169,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build request-logic' - command: 'yarn workspace @requestnetwork/request-logic run build' + name: "Build request-logic" + command: "yarn workspace @requestnetwork/request-logic run build" - run: - name: 'Lint request-logic' - command: 'yarn workspace @requestnetwork/request-logic run lint' + name: "Lint request-logic" + command: "yarn workspace @requestnetwork/request-logic run lint" - run: - name: 'Test request-logic' - command: 'yarn workspace @requestnetwork/request-logic run test' + name: "Test request-logic" + command: "yarn workspace @requestnetwork/request-logic run test" - persist_to_workspace: root: *working_directory paths: @@ -189,14 +189,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build advanced-logic' - command: 'yarn workspace @requestnetwork/advanced-logic run build' + name: "Build advanced-logic" + command: "yarn workspace @requestnetwork/advanced-logic run build" - run: - name: 'Lint advanced-logic' - command: 'yarn workspace @requestnetwork/advanced-logic run lint' + name: "Lint advanced-logic" + command: "yarn workspace @requestnetwork/advanced-logic run lint" - run: - name: 'Test advanced-logic' - command: 'yarn workspace @requestnetwork/advanced-logic run test' + name: "Test advanced-logic" + command: "yarn workspace @requestnetwork/advanced-logic run test" - persist_to_workspace: root: *working_directory paths: @@ -211,17 +211,17 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build request-node' - command: 'yarn workspace @requestnetwork/request-node run build' + name: "Build request-node" + command: "yarn workspace @requestnetwork/request-node run build" - run: - name: 'Lint request-node' - command: 'yarn workspace @requestnetwork/request-node run lint' + name: "Lint request-node" + command: "yarn workspace @requestnetwork/request-node run lint" - run: - name: 'Deploy test contract from ethereum-storage' - command: 'yarn workspace @requestnetwork/ethereum-storage run deploy' + name: "Deploy test contract from ethereum-storage" + command: "yarn workspace @requestnetwork/ethereum-storage run deploy" - run: - name: 'Test request-node' - command: 'yarn workspace @requestnetwork/request-node run test' + name: "Test request-node" + command: "yarn workspace @requestnetwork/request-node run test" - persist_to_workspace: root: *working_directory paths: @@ -234,11 +234,11 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build types' - command: 'yarn workspace @requestnetwork/types run build' + name: "Build types" + command: "yarn workspace @requestnetwork/types run build" - run: - name: 'Lint types' - command: 'yarn workspace @requestnetwork/types run lint' + name: "Lint types" + command: "yarn workspace @requestnetwork/types run lint" test-utils: docker: - *node_image @@ -247,14 +247,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build utils' - command: 'yarn workspace @requestnetwork/utils run build' + name: "Build utils" + command: "yarn workspace @requestnetwork/utils run build" - run: - name: 'Lint utils' - command: 'yarn workspace @requestnetwork/utils run lint' + name: "Lint utils" + command: "yarn workspace @requestnetwork/utils run lint" - run: - name: 'Test utils' - command: 'yarn workspace @requestnetwork/utils run test' + name: "Test utils" + command: "yarn workspace @requestnetwork/utils run test" - persist_to_workspace: root: *working_directory paths: @@ -267,14 +267,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build epk-signature' - command: 'yarn workspace @requestnetwork/epk-signature run build' + name: "Build epk-signature" + command: "yarn workspace @requestnetwork/epk-signature run build" - run: - name: 'Lint epk-signature' - command: 'yarn workspace @requestnetwork/epk-signature run lint' + name: "Lint epk-signature" + command: "yarn workspace @requestnetwork/epk-signature run lint" - run: - name: 'Test epk-signature' - command: 'yarn workspace @requestnetwork/epk-signature run test' + name: "Test epk-signature" + command: "yarn workspace @requestnetwork/epk-signature run test" - persist_to_workspace: root: *working_directory paths: @@ -287,14 +287,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build epk-decryption' - command: 'yarn workspace @requestnetwork/epk-decryption run build' + name: "Build epk-decryption" + command: "yarn workspace @requestnetwork/epk-decryption run build" - run: - name: 'Lint epk-decryption' - command: 'yarn workspace @requestnetwork/epk-decryption run lint' + name: "Lint epk-decryption" + command: "yarn workspace @requestnetwork/epk-decryption run lint" - run: - name: 'Test epk-decryption' - command: 'yarn workspace @requestnetwork/epk-decryption run test' + name: "Test epk-decryption" + command: "yarn workspace @requestnetwork/epk-decryption run test" - persist_to_workspace: root: *working_directory paths: @@ -307,14 +307,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build web3-signature' - command: 'yarn workspace @requestnetwork/web3-signature run build' + name: "Build web3-signature" + command: "yarn workspace @requestnetwork/web3-signature run build" - run: - name: 'Lint web3-signature' - command: 'yarn workspace @requestnetwork/web3-signature run lint' + name: "Lint web3-signature" + command: "yarn workspace @requestnetwork/web3-signature run lint" - run: - name: 'Test web3-signature' - command: 'yarn workspace @requestnetwork/web3-signature run test' + name: "Test web3-signature" + command: "yarn workspace @requestnetwork/web3-signature run test" - persist_to_workspace: root: *working_directory paths: @@ -329,20 +329,20 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build integration-test' - command: 'yarn workspace @requestnetwork/integration-test run build' + name: "Build integration-test" + command: "yarn workspace @requestnetwork/integration-test run build" - run: - name: 'Lint integration-test' - command: 'yarn workspace @requestnetwork/integration-test run lint' + name: "Lint integration-test" + command: "yarn workspace @requestnetwork/integration-test run lint" - run: - name: 'Deploy test contract from ethereum-storage' - command: 'yarn workspace @requestnetwork/ethereum-storage run deploy' + name: "Deploy test contract from ethereum-storage" + command: "yarn workspace @requestnetwork/ethereum-storage run deploy" - run: - name: 'Start request-node' - command: 'yarn workspace @requestnetwork/request-node run start' + name: "Start request-node" + command: "yarn workspace @requestnetwork/request-node run start" background: true - run: - name: 'Waiting for Request Node to be ready' + name: "Waiting for Request Node to be ready" command: | for i in `seq 1 10`; do @@ -352,8 +352,8 @@ jobs: done echo Failed waiting for Node initialization && exit 1 - run: - name: 'Test integration-test' - command: 'yarn workspace @requestnetwork/integration-test run test' + name: "Test integration-test" + command: "yarn workspace @requestnetwork/integration-test run test" test-usage-examples: docker: - *node_image @@ -362,14 +362,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build usage-examples' - command: 'yarn workspace @requestnetwork/usage-examples run build' + name: "Build usage-examples" + command: "yarn workspace @requestnetwork/usage-examples run build" - run: - name: 'Lint usage-examples' - command: 'yarn workspace @requestnetwork/usage-examples run lint' + name: "Lint usage-examples" + command: "yarn workspace @requestnetwork/usage-examples run lint" - run: - name: 'Execute usage-examples' - command: 'yarn workspace @requestnetwork/usage-examples run start' + name: "Execute usage-examples" + command: "yarn workspace @requestnetwork/usage-examples run start" test-toolbox: docker: - *node_image @@ -378,11 +378,11 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build toolbox' - command: 'yarn workspace @requestnetwork/toolbox run build' + name: "Build toolbox" + command: "yarn workspace @requestnetwork/toolbox run build" - run: - name: 'Lint toolbox' - command: 'yarn workspace @requestnetwork/toolbox run lint' + name: "Lint toolbox" + command: "yarn workspace @requestnetwork/toolbox run lint" test-multi-format: docker: - *node_image @@ -391,14 +391,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build multi-format' - command: 'yarn workspace @requestnetwork/multi-format run build' + name: "Build multi-format" + command: "yarn workspace @requestnetwork/multi-format run build" - run: - name: 'Lint multi-format' - command: 'yarn workspace @requestnetwork/multi-format run lint' + name: "Lint multi-format" + command: "yarn workspace @requestnetwork/multi-format run lint" - run: - name: 'Test multi-format' - command: 'yarn workspace @requestnetwork/multi-format run test' + name: "Test multi-format" + command: "yarn workspace @requestnetwork/multi-format run test" - persist_to_workspace: root: *working_directory paths: @@ -411,17 +411,18 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Publish Coverage' - command: 'yarn publish-coverage' + name: "Publish Coverage" + command: "yarn publish-coverage" push-request-network-image: executor: gcp/default steps: - checkout - - setup_remote_docker + - setup_remote_docker: + docker_layer_caching: true - gcp/install - gcp/initialize - run: - name: 'gcloud docker auth' + name: "gcloud docker auth" command: gcloud auth configure-docker --project $GOOGLE_PROJECT_ID --quiet - gcp-gcr/build-image: image: request-network @@ -447,8 +448,8 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build prototype-estimator' - command: 'yarn workspace @requestnetwork/prototype-estimator run build' + name: "Build prototype-estimator" + command: "yarn workspace @requestnetwork/prototype-estimator run build" test-nightly: test-integration-test: docker: @@ -460,17 +461,17 @@ jobs: - attach_workspace: at: *working_directory - run: - name: 'Build integration-test' - command: 'yarn workspace @requestnetwork/integration-test run build' + name: "Build integration-test" + command: "yarn workspace @requestnetwork/integration-test run build" - run: - name: 'Lint integration-test' - command: 'yarn workspace @requestnetwork/integration-test run lint' + name: "Lint integration-test" + command: "yarn workspace @requestnetwork/integration-test run lint" - run: - name: 'Deploy test contract from ethereum-storage' - command: 'yarn workspace @requestnetwork/ethereum-storage run deploy' + name: "Deploy test contract from ethereum-storage" + command: "yarn workspace @requestnetwork/ethereum-storage run deploy" - run: - name: 'Start request-node' - command: 'yarn workspace @requestnetwork/request-node run start' + name: "Start request-node" + command: "yarn workspace @requestnetwork/request-node run start" background: true - run: name: Waiting for Request Node to be ready @@ -483,8 +484,8 @@ jobs: done echo Failed waiting for Node initialization && exit 1 - run: - name: 'Test integration-test' - command: 'yarn workspace @requestnetwork/integration-test run test:scheduled' + name: "Test integration-test" + command: "yarn workspace @requestnetwork/integration-test run test:scheduled" workflows: version: 2 @@ -574,7 +575,7 @@ workflows: triggers: - schedule: # This is a cron job for "everyday at 22 hours" - cron: '0 22 * * *' + cron: "0 22 * * *" filters: branches: only: From 798471520f24644f62a1f7a1f58527b37a3fcf3f Mon Sep 17 00:00:00 2001 From: Benjamin LEVESQUE <14175665+benjlevesque@users.noreply.github.com> Date: Tue, 3 Dec 2019 13:12:08 +0100 Subject: [PATCH 2/5] optimize docker build --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4d17e368c3..ca12e113e2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,9 @@ FROM node:10-alpine WORKDIR /app -COPY . . - RUN apk add --no-cache --virtual .build-deps git python g++ bash make && \ yarn && \ yarn build && \ apk del .build-deps + +COPY . . From aa600b5ce377fd59a9ec63260b00dd2564a5ee61 Mon Sep 17 00:00:00 2001 From: Benjamin LEVESQUE <14175665+benjlevesque@users.noreply.github.com> Date: Tue, 3 Dec 2019 13:41:28 +0100 Subject: [PATCH 3/5] docker optimizations --- .dockerignore | 7 ++++++- Dockerfile | 14 ++++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.dockerignore b/.dockerignore index 2ecb1223e2..acb2190a8e 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,8 @@ Dockerfile node_modules -packages/**/node_modules \ No newline at end of file +packages/**/node_modules +.git +.github +.vscode +*.md +.circleci \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index ca12e113e2..93bc904954 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,15 @@ FROM node:10-alpine WORKDIR /app -RUN apk add --no-cache --virtual .build-deps git python g++ bash make && \ - yarn && \ - yarn build && \ - apk del .build-deps +RUN apk add --virtual .build-deps git python g++ bash make + +COPY package.json . +COPY yarn.lock . + +RUN yarn COPY . . +RUN yarn +RUN yarn build + +RUN apk del .build-deps From bf43f0a0a57ef02c666c0d3ff9f3236ffdfa3253 Mon Sep 17 00:00:00 2001 From: Benjamin LEVESQUE <14175665+benjlevesque@users.noreply.github.com> Date: Tue, 3 Dec 2019 13:57:03 +0100 Subject: [PATCH 4/5] revert formatting --- .circleci/config.yml | 282 +++++++++++++++++++++---------------------- 1 file changed, 141 insertions(+), 141 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 998e92f6dc..a1bb024fce 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 references: working_directory: &working_directory ~/repo attach_workspace: &attach_workspace - image_name: &image_name "circleci/python:3.7" + image_name: &image_name 'circleci/python:3.7' node_image: &node_image image: circleci/node:10 ipfs_image: &ipfs_image @@ -11,10 +11,10 @@ references: ganache_image: &ganache_image image: trufflesuite/ganache-cli:v6.3.0 command: - - "-l" - - "90000000" - - "-m" - - "candy maple cake sugar pudding cream honey rich smooth crumble sweet treat" + - '-l' + - '90000000' + - '-m' + - 'candy maple cake sugar pudding cream honey rich smooth crumble sweet treat' orbs: gcp-gcr: circleci/gcp-gcr@0.3.0 @@ -28,8 +28,8 @@ jobs: steps: - checkout - run: - name: "Yarn install" - command: "yarn install" + name: 'Yarn install' + command: 'yarn install' - persist_to_workspace: root: *working_directory paths: . @@ -41,8 +41,8 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "lint package.json files" - command: "yarn run packageJsonLint" + name: 'lint package.json files' + command: 'yarn run packageJsonLint' test-request-client: docker: - *node_image @@ -52,17 +52,17 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build request-client.js" - command: "yarn workspace @requestnetwork/request-client.js run build:commonjs" + name: 'Build request-client.js' + command: 'yarn workspace @requestnetwork/request-client.js run build:commonjs' - run: - name: "Lint request-client.js" - command: "yarn workspace @requestnetwork/request-client.js run lint " + name: 'Lint request-client.js' + command: 'yarn workspace @requestnetwork/request-client.js run lint ' - run: - name: "Deploy test contract from ethereum-storage" - command: "yarn workspace @requestnetwork/ethereum-storage run deploy" + name: 'Deploy test contract from ethereum-storage' + command: 'yarn workspace @requestnetwork/ethereum-storage run deploy' - run: - name: "Test request-client.js" - command: "yarn workspace @requestnetwork/request-client.js run test" + name: 'Test request-client.js' + command: 'yarn workspace @requestnetwork/request-client.js run test' - persist_to_workspace: root: *working_directory paths: @@ -75,14 +75,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build data-access" - command: "yarn workspace @requestnetwork/data-access run build" + name: 'Build data-access' + command: 'yarn workspace @requestnetwork/data-access run build' - run: - name: "Lint data-access" - command: "yarn workspace @requestnetwork/data-access run lint " + name: 'Lint data-access' + command: 'yarn workspace @requestnetwork/data-access run lint ' - run: - name: "Test data-access" - command: "yarn workspace @requestnetwork/data-access run test" + name: 'Test data-access' + command: 'yarn workspace @requestnetwork/data-access run test' - persist_to_workspace: root: *working_directory paths: @@ -95,14 +95,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build data-format" - command: "yarn workspace @requestnetwork/data-format run build" + name: 'Build data-format' + command: 'yarn workspace @requestnetwork/data-format run build' - run: - name: "Lint data-format" - command: "yarn workspace @requestnetwork/data-format run lint" + name: 'Lint data-format' + command: 'yarn workspace @requestnetwork/data-format run lint' - run: - name: "Test data-format" - command: "yarn workspace @requestnetwork/data-format run test" + name: 'Test data-format' + command: 'yarn workspace @requestnetwork/data-format run test' - persist_to_workspace: root: *working_directory paths: @@ -115,14 +115,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build transaction-manager" - command: "yarn workspace @requestnetwork/transaction-manager run build" + name: 'Build transaction-manager' + command: 'yarn workspace @requestnetwork/transaction-manager run build' - run: - name: "Lint transaction-manager" - command: "yarn workspace @requestnetwork/transaction-manager run lint" + name: 'Lint transaction-manager' + command: 'yarn workspace @requestnetwork/transaction-manager run lint' - run: - name: "Test transaction-manager" - command: "yarn workspace @requestnetwork/transaction-manager run test" + name: 'Test transaction-manager' + command: 'yarn workspace @requestnetwork/transaction-manager run test' - persist_to_workspace: root: *working_directory paths: @@ -137,26 +137,26 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build ethereum-storage" - command: "yarn workspace @requestnetwork/ethereum-storage run build:lib" + name: 'Build ethereum-storage' + command: 'yarn workspace @requestnetwork/ethereum-storage run build:lib' - run: - name: "Lint ethereum-storage" - command: "yarn workspace @requestnetwork/ethereum-storage run lint:lib" + name: 'Lint ethereum-storage' + command: 'yarn workspace @requestnetwork/ethereum-storage run lint:lib' - run: - name: "Deploy contracs ethereum-storage" - command: "yarn workspace @requestnetwork/ethereum-storage run deploy" + name: 'Deploy contracs ethereum-storage' + command: 'yarn workspace @requestnetwork/ethereum-storage run deploy' - run: - name: "Test ethereum-storage" - command: "yarn workspace @requestnetwork/ethereum-storage run test:lib" + name: 'Test ethereum-storage' + command: 'yarn workspace @requestnetwork/ethereum-storage run test:lib' - run: - name: "Build smart contracts ethereum-storage" - command: "yarn workspace @requestnetwork/ethereum-storage run build:sol" + name: 'Build smart contracts ethereum-storage' + command: 'yarn workspace @requestnetwork/ethereum-storage run build:sol' - run: - name: "Lint smart contracts ethereum-storage" - command: "yarn workspace @requestnetwork/ethereum-storage run lint:sol" + name: 'Lint smart contracts ethereum-storage' + command: 'yarn workspace @requestnetwork/ethereum-storage run lint:sol' - run: - name: "Test smart contracts ethereum-storage" - command: "yarn workspace @requestnetwork/ethereum-storage run test:sol" + name: 'Test smart contracts ethereum-storage' + command: 'yarn workspace @requestnetwork/ethereum-storage run test:sol' - persist_to_workspace: root: *working_directory paths: @@ -169,14 +169,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build request-logic" - command: "yarn workspace @requestnetwork/request-logic run build" + name: 'Build request-logic' + command: 'yarn workspace @requestnetwork/request-logic run build' - run: - name: "Lint request-logic" - command: "yarn workspace @requestnetwork/request-logic run lint" + name: 'Lint request-logic' + command: 'yarn workspace @requestnetwork/request-logic run lint' - run: - name: "Test request-logic" - command: "yarn workspace @requestnetwork/request-logic run test" + name: 'Test request-logic' + command: 'yarn workspace @requestnetwork/request-logic run test' - persist_to_workspace: root: *working_directory paths: @@ -189,14 +189,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build advanced-logic" - command: "yarn workspace @requestnetwork/advanced-logic run build" + name: 'Build advanced-logic' + command: 'yarn workspace @requestnetwork/advanced-logic run build' - run: - name: "Lint advanced-logic" - command: "yarn workspace @requestnetwork/advanced-logic run lint" + name: 'Lint advanced-logic' + command: 'yarn workspace @requestnetwork/advanced-logic run lint' - run: - name: "Test advanced-logic" - command: "yarn workspace @requestnetwork/advanced-logic run test" + name: 'Test advanced-logic' + command: 'yarn workspace @requestnetwork/advanced-logic run test' - persist_to_workspace: root: *working_directory paths: @@ -211,17 +211,17 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build request-node" - command: "yarn workspace @requestnetwork/request-node run build" + name: 'Build request-node' + command: 'yarn workspace @requestnetwork/request-node run build' - run: - name: "Lint request-node" - command: "yarn workspace @requestnetwork/request-node run lint" + name: 'Lint request-node' + command: 'yarn workspace @requestnetwork/request-node run lint' - run: - name: "Deploy test contract from ethereum-storage" - command: "yarn workspace @requestnetwork/ethereum-storage run deploy" + name: 'Deploy test contract from ethereum-storage' + command: 'yarn workspace @requestnetwork/ethereum-storage run deploy' - run: - name: "Test request-node" - command: "yarn workspace @requestnetwork/request-node run test" + name: 'Test request-node' + command: 'yarn workspace @requestnetwork/request-node run test' - persist_to_workspace: root: *working_directory paths: @@ -234,11 +234,11 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build types" - command: "yarn workspace @requestnetwork/types run build" + name: 'Build types' + command: 'yarn workspace @requestnetwork/types run build' - run: - name: "Lint types" - command: "yarn workspace @requestnetwork/types run lint" + name: 'Lint types' + command: 'yarn workspace @requestnetwork/types run lint' test-utils: docker: - *node_image @@ -247,14 +247,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build utils" - command: "yarn workspace @requestnetwork/utils run build" + name: 'Build utils' + command: 'yarn workspace @requestnetwork/utils run build' - run: - name: "Lint utils" - command: "yarn workspace @requestnetwork/utils run lint" + name: 'Lint utils' + command: 'yarn workspace @requestnetwork/utils run lint' - run: - name: "Test utils" - command: "yarn workspace @requestnetwork/utils run test" + name: 'Test utils' + command: 'yarn workspace @requestnetwork/utils run test' - persist_to_workspace: root: *working_directory paths: @@ -267,14 +267,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build epk-signature" - command: "yarn workspace @requestnetwork/epk-signature run build" + name: 'Build epk-signature' + command: 'yarn workspace @requestnetwork/epk-signature run build' - run: - name: "Lint epk-signature" - command: "yarn workspace @requestnetwork/epk-signature run lint" + name: 'Lint epk-signature' + command: 'yarn workspace @requestnetwork/epk-signature run lint' - run: - name: "Test epk-signature" - command: "yarn workspace @requestnetwork/epk-signature run test" + name: 'Test epk-signature' + command: 'yarn workspace @requestnetwork/epk-signature run test' - persist_to_workspace: root: *working_directory paths: @@ -287,14 +287,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build epk-decryption" - command: "yarn workspace @requestnetwork/epk-decryption run build" + name: 'Build epk-decryption' + command: 'yarn workspace @requestnetwork/epk-decryption run build' - run: - name: "Lint epk-decryption" - command: "yarn workspace @requestnetwork/epk-decryption run lint" + name: 'Lint epk-decryption' + command: 'yarn workspace @requestnetwork/epk-decryption run lint' - run: - name: "Test epk-decryption" - command: "yarn workspace @requestnetwork/epk-decryption run test" + name: 'Test epk-decryption' + command: 'yarn workspace @requestnetwork/epk-decryption run test' - persist_to_workspace: root: *working_directory paths: @@ -307,14 +307,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build web3-signature" - command: "yarn workspace @requestnetwork/web3-signature run build" + name: 'Build web3-signature' + command: 'yarn workspace @requestnetwork/web3-signature run build' - run: - name: "Lint web3-signature" - command: "yarn workspace @requestnetwork/web3-signature run lint" + name: 'Lint web3-signature' + command: 'yarn workspace @requestnetwork/web3-signature run lint' - run: - name: "Test web3-signature" - command: "yarn workspace @requestnetwork/web3-signature run test" + name: 'Test web3-signature' + command: 'yarn workspace @requestnetwork/web3-signature run test' - persist_to_workspace: root: *working_directory paths: @@ -329,20 +329,20 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build integration-test" - command: "yarn workspace @requestnetwork/integration-test run build" + name: 'Build integration-test' + command: 'yarn workspace @requestnetwork/integration-test run build' - run: - name: "Lint integration-test" - command: "yarn workspace @requestnetwork/integration-test run lint" + name: 'Lint integration-test' + command: 'yarn workspace @requestnetwork/integration-test run lint' - run: - name: "Deploy test contract from ethereum-storage" - command: "yarn workspace @requestnetwork/ethereum-storage run deploy" + name: 'Deploy test contract from ethereum-storage' + command: 'yarn workspace @requestnetwork/ethereum-storage run deploy' - run: - name: "Start request-node" - command: "yarn workspace @requestnetwork/request-node run start" + name: 'Start request-node' + command: 'yarn workspace @requestnetwork/request-node run start' background: true - run: - name: "Waiting for Request Node to be ready" + name: 'Waiting for Request Node to be ready' command: | for i in `seq 1 10`; do @@ -352,8 +352,8 @@ jobs: done echo Failed waiting for Node initialization && exit 1 - run: - name: "Test integration-test" - command: "yarn workspace @requestnetwork/integration-test run test" + name: 'Test integration-test' + command: 'yarn workspace @requestnetwork/integration-test run test' test-usage-examples: docker: - *node_image @@ -362,14 +362,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build usage-examples" - command: "yarn workspace @requestnetwork/usage-examples run build" + name: 'Build usage-examples' + command: 'yarn workspace @requestnetwork/usage-examples run build' - run: - name: "Lint usage-examples" - command: "yarn workspace @requestnetwork/usage-examples run lint" + name: 'Lint usage-examples' + command: 'yarn workspace @requestnetwork/usage-examples run lint' - run: - name: "Execute usage-examples" - command: "yarn workspace @requestnetwork/usage-examples run start" + name: 'Execute usage-examples' + command: 'yarn workspace @requestnetwork/usage-examples run start' test-toolbox: docker: - *node_image @@ -378,11 +378,11 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build toolbox" - command: "yarn workspace @requestnetwork/toolbox run build" + name: 'Build toolbox' + command: 'yarn workspace @requestnetwork/toolbox run build' - run: - name: "Lint toolbox" - command: "yarn workspace @requestnetwork/toolbox run lint" + name: 'Lint toolbox' + command: 'yarn workspace @requestnetwork/toolbox run lint' test-multi-format: docker: - *node_image @@ -391,14 +391,14 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build multi-format" - command: "yarn workspace @requestnetwork/multi-format run build" + name: 'Build multi-format' + command: 'yarn workspace @requestnetwork/multi-format run build' - run: - name: "Lint multi-format" - command: "yarn workspace @requestnetwork/multi-format run lint" + name: 'Lint multi-format' + command: 'yarn workspace @requestnetwork/multi-format run lint' - run: - name: "Test multi-format" - command: "yarn workspace @requestnetwork/multi-format run test" + name: 'Test multi-format' + command: 'yarn workspace @requestnetwork/multi-format run test' - persist_to_workspace: root: *working_directory paths: @@ -411,8 +411,8 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Publish Coverage" - command: "yarn publish-coverage" + name: 'Publish Coverage' + command: 'yarn publish-coverage' push-request-network-image: executor: gcp/default steps: @@ -422,7 +422,7 @@ jobs: - gcp/install - gcp/initialize - run: - name: "gcloud docker auth" + name: 'gcloud docker auth' command: gcloud auth configure-docker --project $GOOGLE_PROJECT_ID --quiet - gcp-gcr/build-image: image: request-network @@ -448,8 +448,8 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build prototype-estimator" - command: "yarn workspace @requestnetwork/prototype-estimator run build" + name: 'Build prototype-estimator' + command: 'yarn workspace @requestnetwork/prototype-estimator run build' test-nightly: test-integration-test: docker: @@ -461,17 +461,17 @@ jobs: - attach_workspace: at: *working_directory - run: - name: "Build integration-test" - command: "yarn workspace @requestnetwork/integration-test run build" + name: 'Build integration-test' + command: 'yarn workspace @requestnetwork/integration-test run build' - run: - name: "Lint integration-test" - command: "yarn workspace @requestnetwork/integration-test run lint" + name: 'Lint integration-test' + command: 'yarn workspace @requestnetwork/integration-test run lint' - run: - name: "Deploy test contract from ethereum-storage" - command: "yarn workspace @requestnetwork/ethereum-storage run deploy" + name: 'Deploy test contract from ethereum-storage' + command: 'yarn workspace @requestnetwork/ethereum-storage run deploy' - run: - name: "Start request-node" - command: "yarn workspace @requestnetwork/request-node run start" + name: 'Start request-node' + command: 'yarn workspace @requestnetwork/request-node run start' background: true - run: name: Waiting for Request Node to be ready @@ -484,8 +484,8 @@ jobs: done echo Failed waiting for Node initialization && exit 1 - run: - name: "Test integration-test" - command: "yarn workspace @requestnetwork/integration-test run test:scheduled" + name: 'Test integration-test' + command: 'yarn workspace @requestnetwork/integration-test run test:scheduled' workflows: version: 2 @@ -574,8 +574,8 @@ workflows: nightly: triggers: - schedule: - # This is a cron job for "everyday at 22 hours" - cron: "0 22 * * *" + # This is a cron job for 'everyday at 22 hours' + cron: '0 22 * * *' filters: branches: only: From cdd46cbf3dfc63e279943f40d5a7847eb168a216 Mon Sep 17 00:00:00 2001 From: Benjamin LEVESQUE <14175665+benjlevesque@users.noreply.github.com> Date: Tue, 3 Dec 2019 13:57:42 +0100 Subject: [PATCH 5/5] formatting --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a1bb024fce..223193a561 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -574,7 +574,7 @@ workflows: nightly: triggers: - schedule: - # This is a cron job for 'everyday at 22 hours' + # This is a cron job for "everyday at 22 hours" cron: '0 22 * * *' filters: branches: