enhance restore cache to also install missing deps (#2317)

* enhance restore cache to also install missing deps * try node tag * try -node flag * try using node orb now
godaddy-wordpress · Mar 10, 2022 · b0ce97c · b0ce97c
1 parent 923a7ad
commit b0ce97c
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -3,6 +3,7 @@ version: 2.1
 orbs:
   jq: circleci/jq@2.2.0
   browser-tools: circleci/browser-tools@1.1
+  node: circleci/node@5.0.0
 
 executors:
   node_latest:
@@ -13,7 +14,7 @@ executors:
           password: $DOCKERHUB_PASSWORD
   php_56_mysql:
     docker:
-      - image: cimg/php:5.6
+      - image: cimg/php:5.6-node
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -23,7 +24,7 @@ executors:
           password: $DOCKERHUB_PASSWORD
   php_74_mysql:
     docker:
-      - image: cimg/php:7.4
+      - image: cimg/php:7.4-node
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -59,7 +60,7 @@ executors:
           password: $DOCKERHUB_PASSWORD
   php_80_mysql:
     docker:
-      - image: cimg/php:8.0
+      - image: cimg/php:8.0-node
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -71,7 +72,7 @@ executors:
           password: $DOCKERHUB_PASSWORD
   php_81_mysql:
     docker:
-      - image: cimg/php:8.1
+      - image: cimg/php:8.1-node
         auth:
           username: $DOCKERHUB_USERNAME
           password: $DOCKERHUB_PASSWORD
@@ -345,6 +346,11 @@ commands:
       - restore_cache:
           keys:
             - yarn-deps-{{ .Environment.CACHE_VERSION }}
+      - run:
+          name: Install dependencies missing from cache
+          command: |
+            PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
+            yarn install --frozen-lockfile
 
   restore_update_cypress_cache:
     steps:
@@ -530,8 +536,11 @@ commands:
         default: false
     steps:
       - checkout
+      - node/install:
+          node-version: '16.14'
       - attach_workspace:
           at: ~/project
+      - restore_yarn_cache
       - restore_composer_cache
       - wait_for_mysql
       - when: