fix: Fix cache keys.

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.1.2
+
+- Improve cache key checks.
+- Reduce globbing calls.
+
 # 0.1.1
 
 - Updated logging.

helpers.ts

@@ -44,16 +44,26 @@ export function isUsingMoon() {
 	return fs.existsSync(path.join(getWorkingDir(), core.getInput('workspace-root'), '.moon'));
 }
 
+export function getCacheKeyPrefix() {
+	return 'moonrepo-toolchain-v1';
+}
+
 export async function getToolchainCacheKey() {
-	const files = ['**/.prototools'];
+	const files = ['.prototools'];
 
 	if (isUsingMoon()) {
-		files.push(path.join(core.getInput('workspace-root'), '.moon/toolchain.yml'));
+		const root = core.getInput('workspace-root');
+
+		if (root) {
+			files.push(path.join(root, '.prototools'), path.join(root, '.moon/toolchain.yml'));
+		} else {
+			files.push('.moon/toolchain.yml');
+		}
 	}
 
 	const toolchainHash = await glob.hashFiles(files.join('\n'));
 
-	return `moonrepo-toolchain-v1-${process.platform}-${toolchainHash}`;
+	return `${getCacheKeyPrefix()}-${process.platform}-${toolchainHash}`;
 }
 
 export async function installBin(bin: string) {

index.ts

@@ -3,6 +3,7 @@ import * as cache from '@actions/cache';
 import * as core from '@actions/core';
 import {
 	getBinDir,
+	getCacheKeyPrefix,
 	getPluginsDir,
 	getShimsDir,
 	getToolchainCacheKey,
@@ -19,10 +20,11 @@ async function restoreCache() {
 	core.info('Attempting to restore cached toolchain');
 
 	const primaryKey = await getToolchainCacheKey();
+	const cachePrefix = getCacheKeyPrefix();
 	const cacheKey = await cache.restoreCache(
 		[getPluginsDir(), getToolsDir()],
 		primaryKey,
-		[`moonrepo-toolchain-${process.platform}`, 'moonrepo-toolchain'],
+		[`${cachePrefix}-${process.platform}`, cachePrefix],
 		{},
 		false,
 	);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moonrepo/setup-toolchain",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A GitHub action to setup and cache the proto and moon toolchains.",
   "main": "dist/index.js",
   "scripts": {