Bump Node cache version in Circle YML

facebook · Jun 29, 2021 · d13eeca · d13eeca
1 parent 0c282f7
commit d13eeca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 23 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,13 +10,13 @@ aliases:
   - &restore_yarn_cache
     restore_cache:
       name: Restore yarn cache
-      key: v2-node-{{ arch }}-{{ checksum "yarn.lock" }}-yarn
+      key: v3-node-{{ arch }}-{{ checksum "yarn.lock" }}-yarn
 
   - &restore_node_modules
     restore_cache:
       name: Restore node_modules cache
       keys:
-        - v2-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ checksum "workspace_info.txt" }}-node-modules
+        - v3-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ checksum "workspace_info.txt" }}-node-modules
 
   - &TEST_PARALLELISM 20
 
@@ -53,7 +53,7 @@ jobs:
           # checksum. This will speed up the setup job for all PRs where the
           # lockfile is the same.
           name: Save yarn cache for future installs
-          key: v2-node-{{ arch }}-{{ checksum "yarn.lock" }}-yarn
+          key: v3-node-{{ arch }}-{{ checksum "yarn.lock" }}-yarn
           paths:
             - ~/.cache/yarn
       - save_cache:
@@ -62,7 +62,7 @@ jobs:
           # all jobs run on this branch with the same lockfile.
           name: Save node_modules cache
           # This cache key is per branch, a yarn install in setup is required.
-          key: v2-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ checksum "workspace_info.txt" }}-node-modules
+          key: v3-node-{{ arch }}-{{ .Branch }}-{{ checksum "yarn.lock" }}-{{ checksum "workspace_info.txt" }}-node-modules
           paths:
             - node_modules
 
@@ -171,9 +171,9 @@ jobs:
       - run:
           name: Download artifacts for base revision
           command: |
-              git fetch origin main
+              git fetch origin master
               cd ./scripts/release && yarn && cd ../../
-              scripts/release/download-experimental-build.js --commit=$(git merge-base HEAD origin/main)
+              scripts/release/download-experimental-build.js --commit=$(git merge-base HEAD origin/master)
               mv ./build2 ./base-build
       - persist_to_workspace:
           root: .
@@ -356,7 +356,7 @@ jobs:
       - run:
           name: Run publish script
           command: |
-            git fetch origin main
+            git fetch origin master
             cd ./scripts/release && yarn && cd ../../
             scripts/release/prepare-release-from-ci.js --skipTests -r << parameters.release_channel >> --commit=<< parameters.commit_sha >>
             cp ./scripts/release/ci-npmrc ~/.npmrc
@@ -414,7 +414,7 @@ workflows:
           filters:
             branches:
               only:
-                - main
+                - master
 
   # New workflow that will replace "stable" and "experimental"
   build_and_test:
@@ -491,14 +491,14 @@ workflows:
           filters:
             branches:
               ignore:
-                - main
+                - master
           requires:
             - setup
       - sizebot:
           filters:
             branches:
               ignore:
-                - main
+                - master
           requires:
             - get_base_build
             - yarn_build_combined
@@ -514,7 +514,7 @@ workflows:
           filters:
             branches:
               only:
-                - main
+                - master
     jobs:
       - setup
       - test_fuzz:
@@ -555,7 +555,7 @@ workflows:
           filters:
             branches:
               only:
-                - main
+                - master
     jobs:
       - setup
       - publish_prerelease:

diff --git a/scripts/jest/jest-cli.js b/scripts/jest/jest-cli.js
@@ -321,17 +321,6 @@ function main() {
     )
   );
 
-  if (argv.project === 'devtools') {
-    console.log(
-      chalk.blue(`\nRe-installing Yarn dependencies to invalidate cache...`)
-    );
-
-    spawnSync('yarn install', {
-      stdio: 'inherit',
-      cwd: path.join(__dirname, '..', '..'),
-    });
-  }
-
   // Print the release channel and project we're running for quick confirmation.
   console.log(
     chalk.blue(