From 258593b36c888db5579f31e03f0ef5f2c468223e Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Sat, 9 Nov 2019 11:54:42 -0500 Subject: [PATCH 1/7] ci: enumerate caching paths manually --- .circleci/config.yml | 64 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 60 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3d72787e93..8ce5106628 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -31,17 +31,73 @@ node_unit_tests: &node_unit_tests echo "CIRCLE_NODE_VERSION=${CIRCLE_NODE_VERSION}" - restore_cache: keys: - - npm-cache-{{ checksum "/tmp/checksums.txt" }} + - npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + - restore_cache: + keys: + - npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + - restore_cache: + keys: + - npm-cache-03-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 - run: name: Install Dependencies command: yarn install - save_cache: - key: npm-cache-{{ checksum "/tmp/checksums.txt" }} + key: npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 paths: - ./node_modules - ./yarn.lock - - ./packages/*/node_modules - - ./packages/*/yarn.lock + - packages/opentelemetry-base/node_modules + - packages/opentelemetry-scope-base/node_modules + - packages/opentelemetry-types/node_modules + - packages/opentelemetry-scope-async-hooks/node_modules + - packages/opentelemetry-core/node_modules + - packages/opentelemetry-exporter-prometheus/node_modules + - packages/opentelemetry-metrics/node_modules + - packages/opentelemetry-tracing/node_modules + - packages/opentelemetry-exporter-jaeger/node_modules + - packages/opentelemetry-exporter-zipkin/node_modules + - packages/opentelemetry-node/node_modules + - packages/opentelemetry-shim-opentracing/node_modules + - packages/opentelemetry-web/node_modules + - packages/opentelemetry-plugin-dns/node_modules + - save_cache: + key: npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + paths: + - packages/opentelemetry-plugin-grpc/node_modules + - packages/opentelemetry-plugin-http/node_modules + - packages/opentelemetry-plugin-http2/node_modules + - packages/opentelemetry-plugin-mongodb/node_modules + - packages/opentelemetry-plugin-redis/node_modules + - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/node_modules + - packages/opentelemetry-plugin-document-load/node_modules + - packages/opentelemetry-plugin-https/node_modules + - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/node_modules + - packages/opentelemetry-base/yarn.lock + - packages/opentelemetry-scope-base/yarn.lock + - packages/opentelemetry-types/yarn.lock + - packages/opentelemetry-scope-async-hooks/yarn.lock + - packages/opentelemetry-core/yarn.lock + - packages/opentelemetry-exporter-prometheus/yarn.lock + - save_cache: + key: npm-cache-03-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + paths: + - packages/opentelemetry-metrics/yarn.lock + - packages/opentelemetry-tracing/yarn.lock + - packages/opentelemetry-exporter-jaeger/yarn.lock + - packages/opentelemetry-exporter-zipkin/yarn.lock + - packages/opentelemetry-node/yarn.lock + - packages/opentelemetry-shim-opentracing/yarn.lock + - packages/opentelemetry-web/yarn.lock + - packages/opentelemetry-plugin-dns/yarn.lock + - packages/opentelemetry-plugin-grpc/yarn.lock + - packages/opentelemetry-plugin-http/yarn.lock + - packages/opentelemetry-plugin-http2/yarn.lock + - packages/opentelemetry-plugin-mongodb/yarn.lock + - packages/opentelemetry-plugin-redis/yarn.lock + - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/yarn.lock + - packages/opentelemetry-plugin-document-load/yarn.lock + - packages/opentelemetry-plugin-https/yarn.lock + - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/yarn.lock - run: name: Compile code command: yarn compile From eab2e3198f47f41ba7019f6ab216686cf729ff6a Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Sat, 9 Nov 2019 13:11:43 -0500 Subject: [PATCH 2/7] chore: lint fix --- .../src/documentLoad.ts | 2 +- packages/opentelemetry-plugin-grpc/src/grpc.ts | 9 ++++++--- packages/opentelemetry-plugin-http/src/http.ts | 2 +- packages/opentelemetry-plugin-http/src/types.ts | 2 +- packages/opentelemetry-plugin-http/src/utils.ts | 4 +++- .../opentelemetry-plugin-pg/src/pg.ts | 7 ++++--- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/packages/opentelemetry-plugin-document-load/src/documentLoad.ts b/packages/opentelemetry-plugin-document-load/src/documentLoad.ts index 0ffea50d31..520c2b24b0 100644 --- a/packages/opentelemetry-plugin-document-load/src/documentLoad.ts +++ b/packages/opentelemetry-plugin-document-load/src/documentLoad.ts @@ -198,7 +198,7 @@ export class DocumentLoad extends BasePlugin { }); } else { // // fallback to previous version - const perf: (typeof otperformance) & PerformanceLegacy = otperformance; + const perf: typeof otperformance & PerformanceLegacy = otperformance; const performanceTiming = perf.timing; if (performanceTiming) { const keys = Object.values(PTN); diff --git a/packages/opentelemetry-plugin-grpc/src/grpc.ts b/packages/opentelemetry-plugin-grpc/src/grpc.ts index 531bd80bbf..9c44c65abd 100644 --- a/packages/opentelemetry-plugin-grpc/src/grpc.ts +++ b/packages/opentelemetry-plugin-grpc/src/grpc.ts @@ -354,9 +354,12 @@ export class GrpcPlugin extends BasePlugin { parent: currentSpan || undefined, }) .setAttribute(AttributeNames.COMPONENT, GrpcPlugin.component); - return plugin._makeGrpcClientRemoteCall(original, args, this, plugin)( - span - ); + return plugin._makeGrpcClientRemoteCall( + original, + args, + this, + plugin + )(span); }; }; } diff --git a/packages/opentelemetry-plugin-http/src/http.ts b/packages/opentelemetry-plugin-http/src/http.ts index 76278b5760..22c34c62b6 100644 --- a/packages/opentelemetry-plugin-http/src/http.ts +++ b/packages/opentelemetry-plugin-http/src/http.ts @@ -485,7 +485,7 @@ export class HttpPlugin extends BasePlugin { span: Span, execute: T, rethrow: K - ): K extends true ? ReturnType : (ReturnType | void); + ): K extends true ? ReturnType : ReturnType | void; private _safeExecute ReturnType>( span: Span, execute: T, diff --git a/packages/opentelemetry-plugin-http/src/types.ts b/packages/opentelemetry-plugin-http/src/types.ts index 05fe033863..e55c358348 100644 --- a/packages/opentelemetry-plugin-http/src/types.ts +++ b/packages/opentelemetry-plugin-http/src/types.ts @@ -39,7 +39,7 @@ export type RequestSignature = [http.RequestOptions, HttpCallbackOptional] & export type HttpRequestArgs = Array; export type ParsedRequestOptions = - | http.RequestOptions & Partial + | (http.RequestOptions & Partial) | http.RequestOptions; export type Http = typeof http; /* tslint:disable-next-line:no-any */ diff --git a/packages/opentelemetry-plugin-http/src/utils.ts b/packages/opentelemetry-plugin-http/src/utils.ts index b1a27b97fd..fbada00b1f 100644 --- a/packages/opentelemetry-plugin-http/src/utils.ts +++ b/packages/opentelemetry-plugin-http/src/utils.ts @@ -46,7 +46,9 @@ export const getAbsoluteUrl = ( // it should be displayed if it's not 80 and 443 (default ports) if ( (host as string).indexOf(':') === -1 && - (port && port !== '80' && port !== '443') + port && + port !== '80' && + port !== '443' ) { host += `:${port}`; } diff --git a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/pg.ts b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/pg.ts index e41ceee08a..a6841ae33a 100644 --- a/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/pg.ts +++ b/packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/src/pg.ts @@ -97,9 +97,10 @@ export class PostgresPlugin extends BasePlugin { const parentSpan = plugin._tracer.getCurrentSpan(); if (typeof args[args.length - 1] === 'function') { // Patch ParameterQuery callback - args[args.length - 1] = utils.patchCallback(span, args[ - args.length - 1 - ] as PostgresCallback); + args[args.length - 1] = utils.patchCallback( + span, + args[args.length - 1] as PostgresCallback + ); // If a parent span exists, bind the callback if (parentSpan) { args[args.length - 1] = plugin._tracer.bind( From bbe0a58e88082eb59f9663c2ea3a30a83a02561f Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Sat, 9 Nov 2019 15:36:03 -0500 Subject: [PATCH 3/7] ci: share cache with browser too --- .circleci/config.yml | 135 ++++++++++++++++++++++++++----------------- 1 file changed, 81 insertions(+), 54 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8ce5106628..ceab0df9ba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,6 +13,66 @@ postgres_service: &postgres_service POSTGRES_USER: postgres POSTGRES_DB: circle_database +cache_1: &cache_1 + key: npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + paths: + - ./node_modules + - ./yarn.lock + - packages/opentelemetry-base/node_modules + - packages/opentelemetry-scope-base/node_modules + - packages/opentelemetry-types/node_modules + - packages/opentelemetry-scope-async-hooks/node_modules + - packages/opentelemetry-core/node_modules + - packages/opentelemetry-exporter-prometheus/node_modules + - packages/opentelemetry-metrics/node_modules + - packages/opentelemetry-tracing/node_modules + - packages/opentelemetry-exporter-jaeger/node_modules + - packages/opentelemetry-exporter-zipkin/node_modules + - packages/opentelemetry-node/node_modules + - packages/opentelemetry-shim-opentracing/node_modules + - packages/opentelemetry-web/node_modules + - packages/opentelemetry-plugin-dns/node_modules + +cache_2: &cache_2 + key: npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + paths: + - packages/opentelemetry-plugin-grpc/node_modules + - packages/opentelemetry-plugin-http/node_modules + - packages/opentelemetry-plugin-http2/node_modules + - packages/opentelemetry-plugin-mongodb/node_modules + - packages/opentelemetry-plugin-redis/node_modules + - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/node_modules + - packages/opentelemetry-plugin-document-load/node_modules + - packages/opentelemetry-plugin-https/node_modules + - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/node_modules + - packages/opentelemetry-base/yarn.lock + - packages/opentelemetry-scope-base/yarn.lock + - packages/opentelemetry-types/yarn.lock + - packages/opentelemetry-scope-async-hooks/yarn.lock + - packages/opentelemetry-core/yarn.lock + - packages/opentelemetry-exporter-prometheus/yarn.lock + +cache_3: &cache_3 + key: npm-cache-03-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + paths: + - packages/opentelemetry-metrics/yarn.lock + - packages/opentelemetry-tracing/yarn.lock + - packages/opentelemetry-exporter-jaeger/yarn.lock + - packages/opentelemetry-exporter-zipkin/yarn.lock + - packages/opentelemetry-node/yarn.lock + - packages/opentelemetry-shim-opentracing/yarn.lock + - packages/opentelemetry-web/yarn.lock + - packages/opentelemetry-plugin-dns/yarn.lock + - packages/opentelemetry-plugin-grpc/yarn.lock + - packages/opentelemetry-plugin-http/yarn.lock + - packages/opentelemetry-plugin-http2/yarn.lock + - packages/opentelemetry-plugin-mongodb/yarn.lock + - packages/opentelemetry-plugin-redis/yarn.lock + - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/yarn.lock + - packages/opentelemetry-plugin-document-load/yarn.lock + - packages/opentelemetry-plugin-https/yarn.lock + - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/yarn.lock + node_unit_tests: &node_unit_tests steps: - checkout @@ -42,62 +102,11 @@ node_unit_tests: &node_unit_tests name: Install Dependencies command: yarn install - save_cache: - key: npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 - paths: - - ./node_modules - - ./yarn.lock - - packages/opentelemetry-base/node_modules - - packages/opentelemetry-scope-base/node_modules - - packages/opentelemetry-types/node_modules - - packages/opentelemetry-scope-async-hooks/node_modules - - packages/opentelemetry-core/node_modules - - packages/opentelemetry-exporter-prometheus/node_modules - - packages/opentelemetry-metrics/node_modules - - packages/opentelemetry-tracing/node_modules - - packages/opentelemetry-exporter-jaeger/node_modules - - packages/opentelemetry-exporter-zipkin/node_modules - - packages/opentelemetry-node/node_modules - - packages/opentelemetry-shim-opentracing/node_modules - - packages/opentelemetry-web/node_modules - - packages/opentelemetry-plugin-dns/node_modules + <<: *cache_1 - save_cache: - key: npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 - paths: - - packages/opentelemetry-plugin-grpc/node_modules - - packages/opentelemetry-plugin-http/node_modules - - packages/opentelemetry-plugin-http2/node_modules - - packages/opentelemetry-plugin-mongodb/node_modules - - packages/opentelemetry-plugin-redis/node_modules - - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/node_modules - - packages/opentelemetry-plugin-document-load/node_modules - - packages/opentelemetry-plugin-https/node_modules - - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/node_modules - - packages/opentelemetry-base/yarn.lock - - packages/opentelemetry-scope-base/yarn.lock - - packages/opentelemetry-types/yarn.lock - - packages/opentelemetry-scope-async-hooks/yarn.lock - - packages/opentelemetry-core/yarn.lock - - packages/opentelemetry-exporter-prometheus/yarn.lock + <<: *cache_2 - save_cache: - key: npm-cache-03-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 - paths: - - packages/opentelemetry-metrics/yarn.lock - - packages/opentelemetry-tracing/yarn.lock - - packages/opentelemetry-exporter-jaeger/yarn.lock - - packages/opentelemetry-exporter-zipkin/yarn.lock - - packages/opentelemetry-node/yarn.lock - - packages/opentelemetry-shim-opentracing/yarn.lock - - packages/opentelemetry-web/yarn.lock - - packages/opentelemetry-plugin-dns/yarn.lock - - packages/opentelemetry-plugin-grpc/yarn.lock - - packages/opentelemetry-plugin-http/yarn.lock - - packages/opentelemetry-plugin-http2/yarn.lock - - packages/opentelemetry-plugin-mongodb/yarn.lock - - packages/opentelemetry-plugin-redis/yarn.lock - - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/yarn.lock - - packages/opentelemetry-plugin-document-load/yarn.lock - - packages/opentelemetry-plugin-https/yarn.lock - - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/yarn.lock + <<: *cache_3 - run: name: Compile code command: yarn compile @@ -111,6 +120,9 @@ node_unit_tests: &node_unit_tests browsers_unit_tests: &browsers_unit_tests steps: - checkout + - run: + name: Create Checksum + command: sh .circleci/checksum.sh /tmp/checksums.txt - run: name: Setup environment variables command: | @@ -121,9 +133,24 @@ browsers_unit_tests: &browsers_unit_tests command: | node --version echo "CIRCLE_NODE_VERSION=${CIRCLE_NODE_VERSION}" + - restore_cache: + keys: + - npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + - restore_cache: + keys: + - npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + - restore_cache: + keys: + - npm-cache-03-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 - run: name: Install Dependencies command: yarn install + - save_cache: + <<: *cache_1 + - save_cache: + <<: *cache_2 + - save_cache: + <<: *cache_3 - run: name: Compile code command: yarn compile From ad959ae8cf1a34542e997abf30037d112c86a107 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Mon, 11 Nov 2019 15:09:07 -0500 Subject: [PATCH 4/7] chore: remove yarn.lock from cache --- .circleci/config.yml | 38 +++----------------------------------- 1 file changed, 3 insertions(+), 35 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 6655dddf22..3c78c4ac44 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -34,7 +34,7 @@ cache_1: &cache_1 - packages/opentelemetry-plugin-dns/node_modules cache_2: &cache_2 - key: npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + key: npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-2 paths: - packages/opentelemetry-plugin-grpc/node_modules - packages/opentelemetry-plugin-http/node_modules @@ -45,33 +45,6 @@ cache_2: &cache_2 - packages/opentelemetry-plugin-document-load/node_modules - packages/opentelemetry-plugin-https/node_modules - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/node_modules - - packages/opentelemetry-base/yarn.lock - - packages/opentelemetry-scope-base/yarn.lock - - packages/opentelemetry-types/yarn.lock - - packages/opentelemetry-scope-async-hooks/yarn.lock - - packages/opentelemetry-core/yarn.lock - - packages/opentelemetry-exporter-prometheus/yarn.lock - -cache_3: &cache_3 - key: npm-cache-03-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 - paths: - - packages/opentelemetry-metrics/yarn.lock - - packages/opentelemetry-tracing/yarn.lock - - packages/opentelemetry-exporter-jaeger/yarn.lock - - packages/opentelemetry-exporter-zipkin/yarn.lock - - packages/opentelemetry-node/yarn.lock - - packages/opentelemetry-shim-opentracing/yarn.lock - - packages/opentelemetry-web/yarn.lock - - packages/opentelemetry-plugin-dns/yarn.lock - - packages/opentelemetry-plugin-grpc/yarn.lock - - packages/opentelemetry-plugin-http/yarn.lock - - packages/opentelemetry-plugin-http2/yarn.lock - - packages/opentelemetry-plugin-mongodb/yarn.lock - - packages/opentelemetry-plugin-redis/yarn.lock - - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg/yarn.lock - - packages/opentelemetry-plugin-document-load/yarn.lock - - packages/opentelemetry-plugin-https/yarn.lock - - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/yarn.lock node_unit_tests: &node_unit_tests steps: @@ -91,13 +64,10 @@ node_unit_tests: &node_unit_tests echo "CIRCLE_NODE_VERSION=${CIRCLE_NODE_VERSION}" - restore_cache: keys: - - npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + - npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-2 - restore_cache: keys: - - npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 - - restore_cache: - keys: - - npm-cache-03-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 + - npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-2 - run: name: Install Dependencies command: yarn install @@ -105,8 +75,6 @@ node_unit_tests: &node_unit_tests <<: *cache_1 - save_cache: <<: *cache_2 - - save_cache: - <<: *cache_3 - run: name: Compile code command: yarn compile From 2e8f7c80064b01aa65f67732d433da219af50a77 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Mon, 11 Nov 2019 15:10:03 -0500 Subject: [PATCH 5/7] chore: add prometheus deps to cache --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3c78c4ac44..4ce47d1506 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,6 +45,7 @@ cache_2: &cache_2 - packages/opentelemetry-plugin-document-load/node_modules - packages/opentelemetry-plugin-https/node_modules - packages/opentelemetry-plugin-postgres/opentelemetry-plugin-pg-pool/node_modules + - packages/opentelemetry-exporter-prometheus/node_modules node_unit_tests: &node_unit_tests steps: From d16e80b55c91af9f3ad53ba1093157081fd61142 Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Mon, 11 Nov 2019 15:14:55 -0500 Subject: [PATCH 6/7] fix: cache path --- .circleci/config.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ce47d1506..e2ed899dd9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,7 +65,7 @@ node_unit_tests: &node_unit_tests echo "CIRCLE_NODE_VERSION=${CIRCLE_NODE_VERSION}" - restore_cache: keys: - - npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-2 + - npm-cache-01-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 - restore_cache: keys: - npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-2 @@ -118,8 +118,6 @@ browsers_unit_tests: &browsers_unit_tests <<: *cache_1 - save_cache: <<: *cache_2 - - save_cache: - <<: *cache_3 - run: name: Compile code command: yarn compile From 074ff8726ca6b91a7176dbf232f62984d13eecdf Mon Sep 17 00:00:00 2001 From: Daniel Dyla Date: Tue, 12 Nov 2019 14:24:53 -0500 Subject: [PATCH 7/7] ci: remove errant cache restore --- .circleci/config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e2ed899dd9..a52d62cdba 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -108,9 +108,6 @@ browsers_unit_tests: &browsers_unit_tests - restore_cache: keys: - npm-cache-02-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 - - restore_cache: - keys: - - npm-cache-03-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/checksums.txt" }}-1 - run: name: Install Dependencies command: yarn install