From 39c77560a13216319cd1a68bd2b638390a3c0a6c Mon Sep 17 00:00:00 2001 From: Marcin Wolny Date: Tue, 20 Sep 2022 15:20:04 +0200 Subject: [PATCH] Invalid caching configuration --- .circleci/config.yml | 49 +++++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0510cefca6..4b6eb24a89 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,7 +3,7 @@ version: 2.1 parameters: cache_version: type: string - default: v4 + default: v5 jobs: build: @@ -33,46 +33,46 @@ jobs: - save_cache: key: cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> paths: - - ~/project/contracts/erc20/node_modules - - ~/project/contracts/test-utils/node_modules - - ~/project/contracts/treasury/node_modules - - ~/project/contracts/utils/node_modules - - ~/project/contracts/zero-ex/node_modules - ~/project/node_modules - - ~/project/packages/asset-swapper/node_modules - - ~/project/packages/contract-addresses/node_modules - - ~/project/packages/contract-artifacts/node_modules - - ~/project/packages/contract-wrappers/node_modules - - ~/project/packages/protocol-utils/node_modules - ~/.cache/yarn - save_cache: - key: lib-{{ .Environment.CIRCLE_BRANCH }} + key: lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> paths: - ~/project/contracts/erc20/generated-artifacts/ - ~/project/contracts/erc20/generated-wrappers/ - ~/project/contracts/erc20/lib/ + - ~/project/contracts/erc20/node_modules - ~/project/contracts/erc20/test/generated-artifacts/ - ~/project/contracts/erc20/test/generated-wrappers/ - ~/project/contracts/test-utils/lib/ + - ~/project/contracts/test-utils/node_modules - ~/project/contracts/treasury/generated-artifacts/ - ~/project/contracts/treasury/generated-wrappers/ - ~/project/contracts/treasury/lib/ + - ~/project/contracts/treasury/node_modules - ~/project/contracts/treasury/test/generated-artifacts/ - ~/project/contracts/treasury/test/generated-wrappers/ - ~/project/contracts/utils/generated-artifacts/ - ~/project/contracts/utils/generated-wrappers/ - ~/project/contracts/utils/lib/ + - ~/project/contracts/utils/node_modules - ~/project/contracts/utils/test/generated-artifacts/ - ~/project/contracts/utils/test/generated-wrappers/ - ~/project/contracts/zero-ex/generated-artifacts/ - ~/project/contracts/zero-ex/generated-wrappers/ - ~/project/contracts/zero-ex/lib/ + - ~/project/contracts/zero-ex/node_modules - ~/project/contracts/zero-ex/test/generated-artifacts/ - ~/project/contracts/zero-ex/test/generated-wrappers/ + - ~/project/packages/asset-swapper/node_modules - ~/project/packages/contract-addresses/lib/ + - ~/project/packages/contract-addresses/node_modules - ~/project/packages/contract-artifacts/lib/ + - ~/project/packages/contract-artifacts/node_modules - ~/project/packages/contract-wrappers/lib/ + - ~/project/packages/contract-wrappers/node_modules - ~/project/packages/protocol-utils/lib/ + - ~/project/packages/protocol-utils/node_modules - store_artifacts: path: ~/repo/packages/abi-gen/test-cli/output - store_artifacts: @@ -88,7 +88,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }} + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - run: yarn wsrun -p @0x/contracts-exchange -m --serial -c test:circleci test-integrations-ganache: resource_class: xlarge @@ -101,7 +101,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }} + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - run: yarn wsrun -p @0x/contracts-integrations -m --serial -c test:circleci test-contracts-staking-ganache: resource_class: xlarge @@ -112,7 +112,7 @@ jobs: - restore_cache: keys: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - - lib-{{ .Environment.CIRCLE_BRANCH }} + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - run: yarn wsrun -p @0x/contracts-staking -m --serial -c test:circleci test-contracts-extra-ganache: resource_class: xlarge @@ -125,7 +125,7 @@ jobs: - cache-{{ checksum "yarn.lock" }} - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }} + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - run: yarn wsrun -p @0x/contracts-exchange-forwarder -p @0x/contracts-coordinator -m --serial -c test:circleci test-contracts-rest-ganache: resource_class: xlarge @@ -143,7 +143,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }} + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - run: | yarn wsrun \ -p @0x/contracts-multisig \ @@ -173,7 +173,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }} + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - run: git submodule update --init --recursive - run: command: forge test @@ -198,7 +198,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }} + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - run: command: yarn test:publish:circleci no_output_timeout: 1800 @@ -214,7 +214,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }} + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - run: command: yarn test:generate_docs:circleci no_output_timeout: 1200 @@ -230,7 +230,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }} + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - run: yarn wsrun -p @0x/contracts-test-utils -m --serial -c test:circleci - run: yarn wsrun -p @0x/contract-addresses -m --serial -c test:circleci - run: yarn wsrun -p @0x/contract-artifacts -m --serial -c test:circleci @@ -257,7 +257,10 @@ jobs: - restore_cache: keys: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - - lib-{{ .Environment.CIRCLE_BRANCH }} + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> + - restore_cache: + keys: + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - run: command: yarn lerna run lint - run: @@ -275,7 +278,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }} + - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}