Merge pull request #3541 from microsoft/hediet/important-slug

Include monaco-editor git commit id in release

scripts/ci/monaco-editor-prepare.ts

@@ -1,6 +1,6 @@
 import { readFile } from 'fs/promises';
 import { join, resolve } from 'path';
-import { PackageJson, getNightlyVersion, group, run, writeJsonFile } from '../lib';
+import { PackageJson, getNightlyVersion, group, run, writeJsonFile, gitCommitId } from '../lib';
 
 const selfPath = __dirname;
 const rootPath = join(selfPath, '..', '..');
@@ -59,6 +59,7 @@ async function prepareMonacoEditorRelease(monacoEditorCoreVersion: string) {
 			await readFile(monacoEditorPackageJsonPath, { encoding: 'utf-8' })
 		) as PackageJson;
 		packageJson.vscodeCommitId = monacoEditorCorePackageJson.vscodeCommitId;
+		packageJson.monacoCommitId = await gitCommitId(rootPath);
 		await writeJsonFile(monacoEditorPackageJsonPath, packageJson);
 	});
 

scripts/lib/index.ts

@@ -37,6 +37,11 @@ export async function runGetOutput(command: string, options: RunOptions): Promis
 	});
 }
 
+export async function gitCommitId(repositoryPath: string): Promise<string> {
+	const commitId = (await runGetOutput('git rev-parse HEAD', { cwd: repositoryPath })).trim();
+	return commitId;
+}
+
 export async function gitShallowClone(
 	targetPath: string,
 	repositoryUrl: string,
@@ -48,7 +53,7 @@ export async function gitShallowClone(
 	await run(`git remote add origin ${repositoryUrl}`, options);
 	await run(`git fetch --depth 1 origin ${ref}`, options);
 	await run(`git checkout ${ref}`, options);
-	const commitId = (await runGetOutput('git rev-parse HEAD', options)).trim();
+	const commitId = await gitCommitId(targetPath);
 	return { commitId };
 }
 
@@ -82,5 +87,6 @@ export interface PackageJson {
 	version: string;
 	vscodeRef?: string;
 	vscodeCommitId?: string;
+	monacoCommitId?: string;
 	devDependencies: Record<string, string>;
 }