From 6da0a951175904d6febc0cc77eecfb1618eccdc4 Mon Sep 17 00:00:00 2001
From: Richard North <rich.north@gmail.com>
Date: Thu, 21 May 2020 20:15:14 +0100
Subject: [PATCH] Prevent Local gradle build cache collisions by ensuring that
 find_gradle_jobs and check jobs always use different cache keys

---
 .github/workflows/ci-examples.yml | 3 ---
 .github/workflows/ci.yml          | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/.github/workflows/ci-examples.yml b/.github/workflows/ci-examples.yml
index bec794dc167..8dab14e831c 100644
--- a/.github/workflows/ci-examples.yml
+++ b/.github/workflows/ci-examples.yml
@@ -25,7 +25,6 @@ jobs:
           key: ${{ runner.os }}-gradle-home-testmatrix-examples-${{ hashFiles('**/*.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-home-testmatrix-examples-
-            ${{ runner.os }}-gradle-home-
       - id: set-matrix
         working-directory: ./examples/
         env:
@@ -54,8 +53,6 @@ jobs:
           key: ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-
-            ${{ runner.os }}-gradle-home-examples-${{matrix.gradle_args}}_check-
-            ${{ runner.os }}-gradle-home-examples-
       - name: Clear existing docker image cache
         run: docker image prune -af
       - name: Build and test Examples with Gradle (${{matrix.gradle_args}})
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 90e64dde133..6ea2319193d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,6 @@ jobs:
           key: ${{ runner.os }}-gradle-home-testmatrix-${{ hashFiles('**/*.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-home-testmatrix-
-            ${{ runner.os }}-gradle-home-
       - id: set-matrix
         env:
           # Since we override the tests executor,
@@ -53,8 +52,6 @@ jobs:
           key: ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-${{ hashFiles('**/*.gradle') }}
           restore-keys: |
             ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-
-            ${{ runner.os }}-gradle-home-${{matrix.gradle_args}}_check-
-            ${{ runner.os }}-gradle-home-
       - name: Clear existing docker image cache
         run: docker image prune -af
       - name: Build and test with Gradle (${{matrix.gradle_args}})