Upgraded checksum tests

facebook · Apr 8, 2022 · dba362a · dba362a
1 parent 559b64d
commit dba362a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -11,12 +11,16 @@ aliases:
     restore_cache:
       name: Restore yarn cache
       key: v2-node-{{ arch }}-{{ checksum "yarn.lock" }}-yarn
+  - &checksum
+    run:
+      name: Generate cache key
+      command: ./scripts/circleci/checksum.sh .yarn/checksum
 
   - &restore_node_modules
     restore_cache:
       name: Restore node_modules cache
       keys:
-        - v2-node-{{ arch }}-{{ .Branch }}-{{ checksum "/tmp/checksum.txt" }}-node-modules
+        - v2-node-{{ arch }}-{{ .Branch }}-{{ checksum ".yarn/checksum" }}-node-modules
 
   - &TEST_PARALLELISM 20
 
@@ -46,10 +50,10 @@ jobs:
       - *restore_yarn_cache
       - run:
           name: Install Packages
-          command: yarn --immutable --immutable-cache --check-cache
+          command: yarn --immutable
       - run:
           name: Generate cache key
-          command: ./scripts/circleci/checksum.sh /tmp/checksum.txt
+          command: ./scripts/circleci/checksum.sh .yarn/checksum
       - save_cache:
           # Store the yarn cache globally for all lock files with this same
           # checksum. This will speed up the setup job for all PRs where the
@@ -64,7 +68,7 @@ jobs:
           # all jobs run on this branch with the same lockfile. Because of yarn workspaces info is deprecated, all yarn.lock and package.json files are checksummed.
           name: Save node_modules cache
           # This cache key is per branch, a yarn install in setup is required.
-          key: v2-node-{{ arch }}-{{ .Branch }}-{{ checksum "/tmp/checksum.txt" }}-node-modules
+          key: v2-node-{{ arch }}-{{ .Branch }}-{{ checksum ".yarn/checksum" }}-node-modules
           paths:
             - node_modules
 
@@ -74,6 +78,7 @@ jobs:
 
     steps:
       - checkout
+      - *checksum
       - *restore_node_modules
       - run: node ./scripts/prettier/index
       - run: node ./scripts/tasks/eslint
@@ -88,6 +93,7 @@ jobs:
 
     steps:
       - checkout
+      - *checksum
       - *restore_node_modules
       - run: node ./scripts/tasks/flow-ci
 
@@ -97,6 +103,7 @@ jobs:
 
     steps:
       - checkout
+      - *checksum
       - *restore_node_modules
       - run:
           command: |
@@ -113,6 +120,7 @@ jobs:
     parallelism: 40
     steps:
       - checkout
+      - *checksum
       - *restore_node_modules
       - run: yarn build-combined
       - persist_to_workspace:
@@ -151,6 +159,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - *checksum
       - *restore_node_modules
       - run: echo "<< pipeline.git.revision	>>" >> build/COMMIT_SHA
         # Compress build directory into a single tarball for easy download
@@ -170,6 +179,7 @@ jobs:
       - attach_workspace:
           at: .
       - run: echo "<< pipeline.git.revision	>>" >> build/COMMIT_SHA
+      - *checksum
       - *restore_node_modules
       - run:
           command: node ./scripts/tasks/danger
@@ -181,6 +191,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - *checksum
       - *restore_node_modules
       - run:
           name: Install Packages
@@ -199,6 +210,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - *checksum
       - *restore_node_modules
       - run:
           name: Install Packages
@@ -220,6 +232,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - *checksum
       - *restore_node_modules
       - run: yarn lint-build
 
@@ -230,6 +243,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - *checksum
       - *restore_node_modules
       - run: yarn check-release-dependencies
 
@@ -240,6 +254,7 @@ jobs:
     steps:
       - checkout
       - attach_workspace: *attach_workspace
+      - *checksum
       - *restore_node_modules
       - run:
           name: Search build artifacts for unminified errors
@@ -256,6 +271,7 @@ jobs:
         type: string
     steps:
       - checkout
+      - *checksum
       - *restore_node_modules
       - run: yarn test <<parameters.args>> --ci
 
@@ -270,6 +286,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - *checksum
       - *restore_node_modules
       - run:
           name: Install nested packages from Yarn cache
@@ -283,6 +300,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - *checksum
       - *restore_node_modules
       - run:
           name: Run DOM fixture tests
@@ -299,6 +317,7 @@ jobs:
     environment: *environment
     steps:
       - checkout
+      - *checksum
       - *restore_node_modules
       - run:
           name: Run fuzz tests
@@ -318,6 +337,7 @@ jobs:
     environment: *environment
     steps:
       - checkout
+      - *checksum
       - *restore_node_modules
       - run:
           name: Run publish script
@@ -336,6 +356,7 @@ jobs:
     environment: *environment
     steps:
       - checkout
+      - *checksum
       - *restore_node_modules
       - run:
           name: Confirm reconciler forks are the same

diff --git a/scripts/circleci/checksum.sh b/scripts/circleci/checksum.sh