From e6688f31b89d930eeb874ac38c4d99828f26fc62 Mon Sep 17 00:00:00 2001 From: daz Date: Fri, 19 Jul 2024 18:40:05 -0600 Subject: [PATCH] Include RUNNER_ARCH in cache key Previously, including RUNNER_OS was enough to prevent leaking incompatible content between Gradle User Homes. With the introduction of macos-14, we now need to differentiate between different runner architectures as well. Fixes #138 --- sources/src/caching/cache-key.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/src/caching/cache-key.ts b/sources/src/caching/cache-key.ts index 48501d7b..e4a42a3c 100644 --- a/sources/src/caching/cache-key.ts +++ b/sources/src/caching/cache-key.ts @@ -73,7 +73,8 @@ export function getCacheKeyBase(cacheName: string, cacheProtocolVersion: string) function getCacheKeyEnvironment(): string { const runnerOs = process.env['RUNNER_OS'] || '' - return process.env[CACHE_KEY_OS_VAR] || runnerOs + const runnerArch = process.env['RUNNER_ARCH'] || '' + return process.env[CACHE_KEY_OS_VAR] || `${runnerOs}-${runnerArch}` } function getCacheKeyJob(): string {