From c3063a70bf55761b2e070a42b2be5f57894d0297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= <jlhwung@gmail.com>
Date: Thu, 2 Jul 2020 11:08:26 -0400
Subject: [PATCH 1/4] chore: refine yarn cache config

---
 .circleci/config.yml | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8258aba3330e..9515a097ce29 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -4,10 +4,12 @@ aliases:
   - &restore-node-modules-cache
     keys:
       - v1-yarn-deps-{{ checksum "yarn.lock" }}
+      - v1-yarn-deps-
 
   - &restore-yarn-cache
     keys:
-      - v1-yarn-cache
+      - v1-yarn-cache-{{ checksum "yarn.lock" }}
+      - v1-yarn-cache-
 
   - &save-node-modules-cache
     paths:
@@ -16,8 +18,8 @@ aliases:
 
   - &save-yarn-cache
     paths:
-      - ~/.yarn-cache
-    key: v1-yarn-cache
+      - "{{ .Environment.YARN_CACHE_FOLDER }}"
+    key: v1-yarn-cache-{{ checksum "yarn.lock" }}
 
   - &artifact_babel
     path: ~/babel/packages/babel-standalone/babel.js
@@ -61,6 +63,7 @@ jobs:
         # data for a JS file that's several megabytes large is bound to fail. Here,
         # we just run the babel-standalone test separately.
       - run: yarn jest "\-standalone/test"
+      - run: export YARN_CACHE_FOLDER=$(yarn cache dir)
       - store_artifacts: *artifact_babel
       - store_artifacts: *artifact_babel_min
       - save_cache: *save-node-modules-cache
@@ -119,13 +122,13 @@ jobs:
             cat ~/diff.tap | $(npm bin)/tap-merge | $(npm bin)/tap-mocha-reporter xunit | tee ~/test-results/test262/results.xml
           <<: *test262_workdir
       - store_test_results: *artifact_test262_xunit
-      - save_cache: *save-node-modules-cache
-      - save_cache: *save-yarn-cache
 
   publish-verdaccio:
     executor: node-executor
     steps:
       - checkout
+      - restore_cache: *restore-yarn-cache
+      - restore_cache: *restore-node-modules-cache
       - run: yarn install
       - run: ./scripts/integration-tests/publish-local.sh
       - persist_to_workspace:
@@ -216,4 +219,3 @@ workflows:
       - e2e-vue-cli:
           requires:
             - publish-verdaccio
-

From cdda85ce0618efb20e4d5ae796f90e3ae0cd06cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= <jlhwung@gmail.com>
Date: Thu, 2 Jul 2020 11:17:30 -0400
Subject: [PATCH 2/4] fix: Circle CI does not support template on paths

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9515a097ce29..01046db4aedc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -18,7 +18,7 @@ aliases:
 
   - &save-yarn-cache
     paths:
-      - "{{ .Environment.YARN_CACHE_FOLDER }}"
+      - ~/.cache/yarn
     key: v1-yarn-cache-{{ checksum "yarn.lock" }}
 
   - &artifact_babel
@@ -63,7 +63,7 @@ jobs:
         # data for a JS file that's several megabytes large is bound to fail. Here,
         # we just run the babel-standalone test separately.
       - run: yarn jest "\-standalone/test"
-      - run: export YARN_CACHE_FOLDER=$(yarn cache dir)
+      - run: yarn cache dir
       - store_artifacts: *artifact_babel
       - store_artifacts: *artifact_babel_min
       - save_cache: *save-node-modules-cache

From 6b4d26c40311bb57d69f29bc74844e38a076ab9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= <jlhwung@gmail.com>
Date: Thu, 2 Jul 2020 11:33:25 -0400
Subject: [PATCH 3/4] chore: manually update yarn cache key

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 01046db4aedc..d3d9f29db3b4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -8,8 +8,8 @@ aliases:
 
   - &restore-yarn-cache
     keys:
-      - v1-yarn-cache-{{ checksum "yarn.lock" }}
-      - v1-yarn-cache-
+      - v1-1-yarn-cache-{{ checksum "yarn.lock" }}
+      - v1-1-yarn-cache-
 
   - &save-node-modules-cache
     paths:
@@ -19,7 +19,7 @@ aliases:
   - &save-yarn-cache
     paths:
       - ~/.cache/yarn
-    key: v1-yarn-cache-{{ checksum "yarn.lock" }}
+    key: v1-1-yarn-cache-{{ checksum "yarn.lock" }}
 
   - &artifact_babel
     path: ~/babel/packages/babel-standalone/babel.js

From 7173491688423aee492e35ca8a13a7cc32794007 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hu=C3=A1ng=20J=C3=B9nli=C3=A0ng?= <jlhwung@gmail.com>
Date: Thu, 2 Jul 2020 12:24:28 -0400
Subject: [PATCH 4/4] remove debug command

---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d3d9f29db3b4..21ff5b59d160 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -63,7 +63,6 @@ jobs:
         # data for a JS file that's several megabytes large is bound to fail. Here,
         # we just run the babel-standalone test separately.
       - run: yarn jest "\-standalone/test"
-      - run: yarn cache dir
       - store_artifacts: *artifact_babel
       - store_artifacts: *artifact_babel_min
       - save_cache: *save-node-modules-cache