diff --git a/circle.yml b/circle.yml index 2edd9135a6af..881c37f7ee1d 100644 --- a/circle.yml +++ b/circle.yml @@ -29,7 +29,7 @@ mainBuildFilters: &mainBuildFilters only: - develop - 10.0-release - - fix-darwin-win32-node-modules-install + - fix-cache-state # usually we don't build Mac app - it takes a long time # but sometimes we want to really confirm we are doing the right thing @@ -38,7 +38,7 @@ macWorkflowFilters: &mac-workflow-filters when: or: - equal: [ develop, << pipeline.git.branch >> ] - - equal: [ fix-darwin-win32-node-modules-install, << pipeline.git.branch >> ] + - equal: [ fix-cache-state, << pipeline.git.branch >> ] - matches: pattern: "-release$" value: << pipeline.git.branch >> @@ -48,7 +48,7 @@ windowsWorkflowFilters: &windows-workflow-filters or: - equal: [ master, << pipeline.git.branch >> ] - equal: [ develop, << pipeline.git.branch >> ] - - equal: [ fix-darwin-win32-node-modules-install, << pipeline.git.branch >> ] + - equal: [ fix-cache-state, << pipeline.git.branch >> ] - matches: pattern: "-release$" value: << pipeline.git.branch >> @@ -265,7 +265,7 @@ commands: - run: name: Bail if cache exists command: | - if [[ -f "/tmp/node_modules_installed" ]]; then + if [[ -f "node_modules_installed" ]]; then echo "Node modules already cached for dependencies, exiting" circleci-agent step halt fi @@ -300,12 +300,12 @@ commands: key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-{{ checksum "circle_cache_key" }} paths: - /tmp/node_modules_cache - - run: touch /tmp/node_modules_installed + - run: touch node_modules_installed - save_cache: name: Saving node-modules cache state key key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-node-modules-cache-state-{{ checksum "circle_cache_key" }} paths: - - /tmp/node_modules_installed + - node_modules_installed - save_cache: name: Save weekly yarn cache key: v{{ .Environment.CACHE_VERSION }}-{{ checksum "platform_key" }}-deps-root-weekly-{{ checksum "cache_date" }} @@ -1626,7 +1626,7 @@ jobs: - run: name: Check current branch to persist artifacts command: | - if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-darwin-win32-node-modules-install" ]]; then + if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "fix-cache-state" ]]; then echo "Not uploading artifacts or posting install comment for this branch." circleci-agent step halt fi