From f2810be61a6dcd2b3bd7c305f969c5447f82df8c Mon Sep 17 00:00:00 2001
From: Steve Gordon <sgordon@hotmail.co.uk>
Date: Wed, 9 Feb 2022 17:15:08 +0000
Subject: [PATCH] Re-enable GitHub action cache steps (#6132)

(cherry picked from commit 4175e96d2f0385eab05648cba6ab5af3ad3aecf1)
---
 .github/workflows/integration-jobs.yml | 24 ++++++++++++------------
 .github/workflows/test-jobs.yml        | 25 ++++++++++++-------------
 2 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/integration-jobs.yml b/.github/workflows/integration-jobs.yml
index dbdc0d74219..a365e8d9879 100644
--- a/.github/workflows/integration-jobs.yml
+++ b/.github/workflows/integration-jobs.yml
@@ -33,18 +33,18 @@ jobs:
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '6.0.101'
-      # - uses: actions/cache@v2
-      #   with:
-      #     path: ~/.nuget/packages
-      #     key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-nuget-
-      # - uses: actions/cache@v2
-      #   with:
-      #     path: ~/.local/share/ElasticManaged/elasticsearch-${{ matrix.stack_version }}
-      #     key: ${{ runner.os }}-elastic-managed-${{ matrix.stack_version }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-elastic-managed-
+      - uses: actions/cache@v2
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-nuget-
+      - uses: actions/cache@v2
+        with:
+          path: ~/.local/share/ElasticManaged/elasticsearch-${{ matrix.stack_version }}
+          key: ${{ runner.os }}-elastic-managed-${{ matrix.stack_version }}
+          restore-keys: |
+            ${{ runner.os }}-elastic-managed-
             
       - run: "./build.sh integrate ${{ matrix.stack_version }} readonly,writable random:test_only_one --report"
         name: ${{ matrix.stack_version }}
diff --git a/.github/workflows/test-jobs.yml b/.github/workflows/test-jobs.yml
index 8d7c3da0e14..9a7906a5067 100644
--- a/.github/workflows/test-jobs.yml
+++ b/.github/workflows/test-jobs.yml
@@ -1,6 +1,5 @@
 name: Tests
 
-
 on:
   pull_request:
     paths-ignore:
@@ -25,12 +24,12 @@ jobs:
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '6.0.101'
-      # - uses: actions/cache@v2
-      #   with:
-      #     path: ~/.nuget/packages
-      #     key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-nuget-
+      - uses: actions/cache@v2
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-nuget-
 
       - run: ./build.sh test --report
         name: Test
@@ -55,12 +54,12 @@ jobs:
       - uses: actions/setup-dotnet@v1
         with:
           dotnet-version: '6.0.101'
-      # - uses: actions/cache@v2
-      #   with:
-      #     path: ~/.nuget/packages
-      #     key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-nuget-
+      - uses: actions/cache@v2
+        with:
+          path: ~/.nuget/packages
+          key: ${{ runner.os }}-nuget-${{ hashFiles('**/packages.lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-nuget-
 
       - run: ./build.sh canary --report
         name: Test