From e846ed2f346438ec691db7472ecf293cc3bfb889 Mon Sep 17 00:00:00 2001 From: Kyu Date: Tue, 11 Oct 2022 10:41:36 -0700 Subject: [PATCH] Replace branch-level Circle CI cache with commit-level cache (#599) * Branch-level cache does not make sense for `lib` because it needs to be updated whenever there is a change in TS files. --- .circleci/config.yml | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3f56e7983d..cf4db28c2b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,14 +11,14 @@ jobs: docker: - image: node:16 environment: - NODE_OPTIONS: "--max-old-space-size=16384" + NODE_OPTIONS: '--max-old-space-size=16384' steps: - checkout - run: git submodule update --init --recursive - run: echo 'export PATH=$HOME/CIRCLE_PROJECT_REPONAME/node_modules/.bin:$PATH' >> $BASH_ENV - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }}-feat/NerveMixinArbitrum + - lib-{{ .Environment.CIRCLE_SHA1 }}-feat/NerveMixinArbitrum - restore_cache: keys: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> @@ -36,7 +36,7 @@ jobs: - ~/project/node_modules - ~/.cache/yarn - save_cache: - key: lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> + key: lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >> paths: - ~/project/contracts/erc20/generated-artifacts/ - ~/project/contracts/erc20/generated-wrappers/ @@ -88,7 +88,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> + - lib-{{ .Environment.CIRCLE_SHA1 }}-<< 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 }}-<< pipeline.parameters.cache_version >> + - lib-{{ .Environment.CIRCLE_SHA1 }}-<< 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 }}-<< pipeline.parameters.cache_version >> + - lib-{{ .Environment.CIRCLE_SHA1 }}-<< 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 }}-<< pipeline.parameters.cache_version >> + - lib-{{ .Environment.CIRCLE_SHA1 }}-<< 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 }}-<< pipeline.parameters.cache_version >> + - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >> - run: | yarn wsrun \ -p @0x/contracts-multisig \ @@ -173,15 +173,15 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> + - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >> - run: git submodule update --init --recursive - run: - command: forge test - working_directory: ~/project/contracts/zero-ex + command: forge test + working_directory: ~/project/contracts/zero-ex test-publish: resource_class: large environment: - NODE_OPTIONS: "--max-old-space-size=6442" + NODE_OPTIONS: '--max-old-space-size=6442' docker: - image: node:16 - image: 0xorg/verdaccio @@ -198,7 +198,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> + - lib-{{ .Environment.CIRCLE_SHA1 }}-<< 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 }}-<< pipeline.parameters.cache_version >> + - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >> - run: command: yarn test:generate_docs:circleci no_output_timeout: 1200 @@ -222,7 +222,7 @@ jobs: docker: - image: node:16 environment: - RUST_ROUTER: "true" + RUST_ROUTER: 'true' steps: - checkout - restore_cache: @@ -230,7 +230,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> + - lib-{{ .Environment.CIRCLE_SHA1 }}-<< 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,10 +257,9 @@ jobs: - restore_cache: keys: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> + - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >> - run: command: yarn lerna run lint - run: @@ -278,7 +277,7 @@ jobs: - cache-{{ checksum "yarn.lock" }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - - lib-{{ .Environment.CIRCLE_BRANCH }}-<< pipeline.parameters.cache_version >> + - lib-{{ .Environment.CIRCLE_SHA1 }}-<< pipeline.parameters.cache_version >> - restore_cache: keys: - coverage-contract-wrappers-test-{{ checksum "yarn.lock" }}