From 24989726d8e5c6c3450b344fbbc623a3f7246b53 Mon Sep 17 00:00:00 2001
From: javieri-empathy <68222542+javieri-empathy@users.noreply.github.com>
Date: Mon, 2 Jan 2023 14:52:15 +0100
Subject: [PATCH] ci: make Cypress cache depend on package. Make eslint cache
 restore last version if no exact match.

EX-7721
---
 .github/workflows/build.yml         | 11 ++++-------
 package-lock.json                   | 14 +++++++-------
 packages/react-wrapper/package.json |  2 +-
 packages/x-components/package.json  |  2 +-
 4 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 62a1a966bf..f5d5173efe 100644
--- 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
index 81703ba578..04f02cbbdd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -33,7 +33,7 @@
         "@vue/vue2-jest": "~27.0.0-alpha.3",
         "autoprefixer": "~10.4.4",
         "concurrently": "~7.6.0",
-        "cypress": "~12.1.0",
+        "cypress": "~12.2.0",
         "esbuild": "0.15.16",
         "eslint-config-prettier": "^8.5.0",
         "eslint-import-resolver-typescript": "~3.5.2",
@@ -8287,9 +8287,9 @@
       "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
     },
     "node_modules/cypress": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.1.0.tgz",
-      "integrity": "sha512-7fz8N84uhN1+ePNDsfQvoWEl4P3/VGKKmAg+bJQFY4onhA37Ys+6oBkGbNdwGeC7n2QqibNVPhk8x3YuQLwzfw==",
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.2.0.tgz",
+      "integrity": "sha512-kvl95ri95KK8mAy++tEU/wUgzAOMiIciZSL97LQvnOinb532m7dGvwN0mDSIGbOd71RREtmT9o4h088RjK5pKw==",
       "hasInstallScript": true,
       "dependencies": {
         "@cypress/request": "^2.88.10",
@@ -28305,9 +28305,9 @@
       "integrity": "sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw=="
     },
     "cypress": {
-      "version": "12.1.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.1.0.tgz",
-      "integrity": "sha512-7fz8N84uhN1+ePNDsfQvoWEl4P3/VGKKmAg+bJQFY4onhA37Ys+6oBkGbNdwGeC7n2QqibNVPhk8x3YuQLwzfw==",
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.2.0.tgz",
+      "integrity": "sha512-kvl95ri95KK8mAy++tEU/wUgzAOMiIciZSL97LQvnOinb532m7dGvwN0mDSIGbOd71RREtmT9o4h088RjK5pKw==",
       "requires": {
         "@cypress/request": "^2.88.10",
         "@cypress/xvfb": "^1.2.4",
diff --git a/packages/react-wrapper/package.json b/packages/react-wrapper/package.json
index 2244b4bf4a..ba7e0c7a4e 100644
--- 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
index 09eaa3353a..aa7aa12d56 100644
--- 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",