From fdce643b53da194b24a4874de749ed1045581373 Mon Sep 17 00:00:00 2001
From: Marco Carrozzo <Marco.Carrozzo@hyland.com>
Date: Thu, 19 Jan 2023 15:31:16 +0100
Subject: [PATCH] removed pip cache

---
 .../actions/download-cache-and-artifacts/action.yml |  2 +-
 .github/actions/setup/action.yml                    | 13 ++-----------
 .github/workflows/pull-request.yml                  |  9 ++++-----
 3 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.github/actions/download-cache-and-artifacts/action.yml b/.github/actions/download-cache-and-artifacts/action.yml
index 26bf51cbc1..73948713c7 100644
--- a/.github/actions/download-cache-and-artifacts/action.yml
+++ b/.github/actions/download-cache-and-artifacts/action.yml
@@ -34,4 +34,4 @@ runs:
         echo "====ADF===="
         find node_modules/@alfresco/ -maxdepth 1 -type d || true
         echo "====NX===="
-        find node_modules/nx/ -maxdepth 1 -type d || true        
\ No newline at end of file
+        find node_modules/nx/ -maxdepth 1 -type d || true
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
index b97ff74546..ad5a8313fa 100644
--- a/.github/actions/setup/action.yml
+++ b/.github/actions/setup/action.yml
@@ -56,18 +56,9 @@ runs:
         with:
           path: |
             node_modules
-          key: node_modules-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          key: ${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
-            node_modules-${{ env.cache-name }}-
-            node_modules-
-      - name: pip cache
-        uses: actions/cache@v3
-        if: ${{ inputs.enable-global-nx-cache == 'true' }}
-        with:
-          path: ~/.cache/pip
-          key: ${{ github.ref_name }}-pip-
-          restore-keys: |
-            ${{ github.ref_name }}
+            ${{ env.cache-name }}-
 # ENV LOAD
       - name: load .travis.yml env.global variables
         uses: Alfresco/alfresco-build-tools/.github/actions/travis-env-load@v1.17.0
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 890d1411b0..8a0e612f44 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -158,11 +158,10 @@ jobs:
         with: 
           enable-global-nx-cache: true
           enable-global-node-modules-cache: false
-          cache-key-suffix: unit-tests
-      - uses: ./.github/actions/download-cache-and-artifacts
-        with:
-          # packages: 'dist node_modules' 
-          packages: 'dist' 
+          cache-key-suffix: unit-tests-${{ matrix.unit-tests.name }}
+      # - uses: ./.github/actions/download-cache-and-artifacts
+      #   with:
+      #     packages: 'node_modules'
       - name: Run unit tests
         run: |
           /usr/bin/xvfb-run --auto-servernum nx affected:test $NX_CALCULATION_FLAGS --exclude=${{ matrix.unit-tests.exclude }}