From 4fab1e5c7f75330a3a475d62121388a1f13d67b2 Mon Sep 17 00:00:00 2001
From: Daz DeBoer <daz@gradle.com>
Date: Wed, 10 Nov 2021 16:44:26 -0700
Subject: [PATCH] Always include cache protocol version in cache key

---
 src/cache-base.ts  | 5 +++--
 src/cache-utils.ts | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/cache-base.ts b/src/cache-base.ts
index 5fa6914..a0276c5 100644
--- a/src/cache-base.ts
+++ b/src/cache-base.ts
@@ -3,14 +3,15 @@ import * as cache from '@actions/cache'
 import * as github from '@actions/github'
 import {isCacheDebuggingEnabled, getCacheKeyPrefix, hashStrings, handleCacheFailure} from './cache-utils'
 
+const CACHE_PROTOCOL_VERSION = 'v4-'
 const JOB_CONTEXT_PARAMETER = 'workflow-job-context'
 
 function generateCacheKey(cacheName: string): CacheKey {
-    const cacheKeyPrefix = getCacheKeyPrefix()
+    const cacheKeyBase = `${getCacheKeyPrefix()}${CACHE_PROTOCOL_VERSION}${cacheName}`
 
     // At the most general level, share caches for all executions on the same OS
     const runnerOs = process.env['RUNNER_OS'] || ''
-    const cacheKeyForOs = `${cacheKeyPrefix}${cacheName}|${runnerOs}`
+    const cacheKeyForOs = `${cacheKeyBase}|${runnerOs}`
 
     // Prefer caches that run this job
     const cacheKeyForJob = `${cacheKeyForOs}|${github.context.job}`
diff --git a/src/cache-utils.ts b/src/cache-utils.ts
index 2913782..ab9c8a2 100644
--- a/src/cache-utils.ts
+++ b/src/cache-utils.ts
@@ -4,8 +4,6 @@ import * as crypto from 'crypto'
 import * as path from 'path'
 import * as fs from 'fs'
 
-const CACHE_PROTOCOL_VERSION = 'v4-'
-
 const CACHE_DISABLED_PARAMETER = 'cache-disabled'
 const CACHE_READONLY_PARAMETER = 'cache-read-only'
 const CACHE_DEBUG_VAR = 'GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED'
@@ -25,7 +23,7 @@ export function isCacheDebuggingEnabled(): boolean {
 
 export function getCacheKeyPrefix(): string {
     // Prefix can be used to force change all cache keys (defaults to cache protocol version)
-    return process.env[CACHE_PREFIX_VAR] || CACHE_PROTOCOL_VERSION
+    return process.env[CACHE_PREFIX_VAR] || ''
 }
 
 export function hashStrings(values: string[]): string {