Update npm install cache keys and npm command for E2E tests

wordpress-mobile · Feb 14, 2023 · 112eab9 · 112eab9
1 parent ed8855b
commit 112eab9
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,16 +7,16 @@ commands:
       - restore_cache:
           name: Restore NPM Cache
           keys:
-            - npm-i18n-v6-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-arch-{{ arch }}-{{ checksum "package-lock.json" }}
-            - npm-i18n-v6-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-arch-{{ arch }}
+            - npm-install-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-{{ arch }}-{{ checksum "package-lock.json" }}
+            - npm-install-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-{{ arch }}-
       - run:
           name: NPM Install
           command: |
             echo "Node version: $(node --version)"
             npm ci --prefer-offline --no-audit
       - save_cache:
           name: Save NPM Cache
-          key: npm-i18n-v6-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-arch-{{ arch }}-{{ checksum "package-lock.json" }}
+          key: npm-install-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-{{ arch }}-{{ checksum "package-lock.json" }}
           paths:
             - ~/.npm
             - src/i18n-cache
@@ -31,31 +31,31 @@ commands:
       - restore_cache:
           name: Restore NPM Cache
           keys:
-            - npm-i18n-v6-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-full-arch-{{ arch }}-{{ checksum "gutenberg/package-lock.json" }}
-            - npm-i18n-v6-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-full-arch-{{ arch }}
+            - npm-install-full-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-{{ arch }}-{{ checksum "gutenberg/package-lock.json" }}
+            - npm-install-full-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-{{ arch }}-
       - run:
           name: NPM Install Full
           command: |
             echo "Node version: $(node --version)"
             npm install --no-audit
       - save_cache:
           name: Save NPM Cache
-          key: npm-i18n-v6-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-full-arch-{{ arch }}-{{ checksum "gutenberg/package-lock.json" }}
+          key: npm-install-full-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-{{ arch }}-{{ checksum "gutenberg/package-lock.json" }}
           paths:
             - ~/.npm
             - src/i18n-cache
             - ~/.local/share/pnpm/store/v3
             - ~/Library/pnpm/store/v3
-  npm-install-without-scripts:
+  npm-install-e2e-tests:
     parameters:
     steps:
       - restore_cache:
           name: Restore NPM Cache
           keys:
-            - npm-i18n-v6-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-arch-{{ arch }}-{{ checksum "package-lock.json" }}
-            - npm-i18n-v6-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-arch-{{ arch }}
+            - npm-install-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-{{ arch }}-{{ checksum "package-lock.json" }}
+            - npm-install-cache-{{ .Environment.CACHE_TRIGGER_VERSION }}-{{ arch }}
       - run:
-          name: NPM Install Without Scripts
+          name: NPM Install (E2E Tests)
           command: |
             echo "Node version: $(node --version)"
             npm ci --prefer-offline --no-audit --ignore-scripts
@@ -247,7 +247,7 @@ jobs:
       - checkout-submodules
       - install-node-version
       - run: node -v
-      - npm-install-without-scripts
+      - npm-install-e2e-tests
       - run: mkdir /home/circleci/test-results
       - run:
           name: Run Device Tests
@@ -354,7 +354,7 @@ jobs:
     - checkout-shallow
     - checkout-submodules
     - install-node-version
-    - npm-install-without-scripts
+    - npm-install-e2e-tests
     - add-jest-reporter-dir
     - run:
         name: Set Environment Variables