ci: make Cypress cache depend on package. Make eslint cache restore l…

…ast version if no exact match. EX-7721
empathyco · Jan 2, 2023 · 2498972 · 2498972
1 parent 0a14f28
commit 2498972
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,20 +23,17 @@ jobs:
         id: cache-node-modules
         uses: actions/cache@v3
         with:
-          path: '**/node_modules'
+          path: |
+           **/node_modules
+            ~/.cache/Cypress
           key: node-modules-${{ hashFiles('**/package-lock.json') }}
-      - name: Cache Cypress
-        id: cache-cypress
-        uses: actions/cache@v3
-        with:
-          path: ~/.cache/Cypress
-          key: cypress-cache
       - name: Cache eslint
         id: cache-eslint
         uses: actions/cache@v3
         with:
           path: .eslintcache
           key: eslint-${{github.sha}}
+          restore-keys: eslint-
       - name: Install lerna and all packages
         if: steps.cache-node-modules.outputs.cache-hit != 'true'
         run: npm ci

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/react-wrapper/package.json b/packages/react-wrapper/package.json
@@ -48,7 +48,7 @@
     "@types/jest": "~27.0.3",
     "@types/react": "~16.9.0",
     "@types/react-dom": "~16.9.0",
-    "cypress": "~12.1.0",
+    "cypress": "~12.2.0",
     "eslint-plugin-react": "~7.31.11",
     "jest": "~27.3.1",
     "react": "^16.9.0",

diff --git a/packages/x-components/package.json b/packages/x-components/package.json
@@ -105,7 +105,7 @@
     "@vue/test-utils": "~1.0.3",
     "@vue/vue2-jest": "~27.0.0-alpha.3",
     "autoprefixer": "~10.4.4",
-    "cypress": "~12.1.0",
+    "cypress": "~12.2.0",
     "esbuild": "0.15.16",
     "glob": "~7.1.6",
     "jest": "~27.3.1",