new: Support proto lockfiles. (#26)

Author: milesj

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.5.0
+
+- Support proto v0.51 changes and `.protolock` files.
+- Fixed the proto/moon versions not being available in the post-run cache key.
+- Updated dependencies.
+
 # 0.4.1
 
 - Include the architecture in the cache key.

helpers.ts

@@ -93,19 +93,24 @@ export function extractMajorMinor(version: string) {
 }
 
 export function getCacheKeyPrefix() {
-	// v1 - Before proto v0.24 changes
-	return 'moonrepo-toolchain-v2';
+	// v2 - Before proto v0.24 changes
+	// v3 - proto v0.51 lockfile changes
+	return 'moonrepo-toolchain-v3';
 }
 
 export async function getToolchainCacheKey() {
 	const hasher = crypto.createHash('sha1');
-	const files = ['.prototools'];
+	const files = ['.prototools', '.protolock'];
 
 	if (isUsingMoon()) {
 		const root = core.getInput('workspace-root');
 
 		if (root) {
-			files.push(path.join(root, '.prototools'), path.join(root, '.moon/toolchain.yml'));
+			files.push(
+				path.join(root, '.prototools'),
+				path.join(root, '.protolock'),
+				path.join(root, '.moon/toolchain.yml'),
+			);
 		} else {
 			files.push('.moon/toolchain.yml');
 		}
@@ -115,15 +120,15 @@ export async function getToolchainCacheKey() {
 
 	hasher.update(await glob.hashFiles(files.join('\n')));
 
-	const protoVersion = process.env.PROTO_CLI_VERSION;
+	const protoVersion = process.env.PROTO_CLI_VERSION ?? core.getState('PROTO_CLI_VERSION');
 
 	if (protoVersion) {
 		core.debug(`Hashing proto version: ${protoVersion}`);
 
 		hasher.update(extractMajorMinor(protoVersion));
 	}
 
-	const moonVersion = process.env.MOON_CLI_VERSION;
+	const moonVersion = process.env.MOON_CLI_VERSION ?? core.getState('MOON_CLI_VERSION');
 
 	if (moonVersion) {
 		core.debug(`Hashing moon version: ${moonVersion}`);
@@ -185,8 +190,11 @@ export async function installBin(bin: string) {
 		const result = await execa(binPath, ['--version'], { stdio: 'pipe' });
 
 		if (result.stdout) {
+			const v = result.stdout.replace(bin, '').trim();
+
 			// eslint-disable-next-line require-atomic-updates
-			process.env[`${envPrefix}_CLI_VERSION`] = result.stdout.replace(bin, '').trim();
+			process.env[`${envPrefix}_CLI_VERSION`] = v;
+			core.saveState(`${envPrefix}_CLI_VERSION`, v);
 
 			core.info(result.stdout);
 		}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moonrepo/setup-toolchain",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "A GitHub action to setup and cache the proto and moon toolchains.",
   "main": "dist/index.js",
   "scripts": {
@@ -19,10 +19,10 @@
   "author": "Miles Johnson",
   "license": "MIT",
   "dependencies": {
-    "@actions/cache": "^4.0.2",
-    "@actions/core": "^1.10.1",
+    "@actions/cache": "^4.0.3",
+    "@actions/core": "^1.11.1",
     "@actions/glob": "^0.5.0",
-    "@actions/tool-cache": "^2.0.1",
+    "@actions/tool-cache": "^2.0.2",
     "execa": "^5.1.1"
   },
   "devDependencies": {