Add build result parsing to CI

kunkunsh · Sep 17, 2024 · 3fd5893 · 3fd5893
1 parent 7eab90f
commit 3fd5893
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 14 deletions.
diff --git a/ci/build-upload.ts b/ci/build-upload.ts
@@ -128,6 +128,8 @@ for (const buildResult of buildResults) {
 			.insert([
 				{
 					name: buildResult.pkg.name,
+					version: buildResult.pkg.version,
+					api_version: buildResult.apiVersion,
 					short_description: buildResult.pkg.kunkun.shortDescription,
 					long_description: buildResult.pkg.kunkun.longDescription,
 					identifier: buildResult.pkg.kunkun.identifier,
@@ -158,6 +160,8 @@ for (const buildResult of buildResults) {
 		.from("extensions")
 		.update({
 			name: buildResult.pkg.kunkun.name,
+			version: buildResult.pkg.version,
+			api_version: buildResult.apiVersion,
 			short_description: buildResult.pkg.kunkun.shortDescription,
 			long_description: buildResult.pkg.kunkun.longDescription,
 			icon: iconClone,

diff --git a/ci/src/utils.ts b/ci/src/utils.ts
@@ -206,14 +206,16 @@ export function buildWithDocker(extPath: string): Promise<{
 	})
 }
 
-export type BuildResult = {
-	shasum: string
-	tarballFilename: string
-	tarballPath: string
-	extPath: string
-	pkg: ExtPackageJson
-	apiVersion: string
-}
+export const BuildResult = v.object({
+	shasum: v.string(),
+	tarballFilename: v.string(),
+	tarballPath: v.string(),
+	extPath: v.string(),
+	pkg: ExtPackageJson,
+	apiVersion: v.string()
+})
+
+export type BuildResult = v.InferOutput<typeof BuildResult>
 
 /**
  * Use this function to build an extension with docker and validate the tarball
@@ -238,14 +240,14 @@ export function buildWithDockerAndValidate(extPath: string): Promise<BuildResult
 				} else {
 					console.log("Shasum matches")
 				}
-				return {
+				return v.parse(BuildResult, {
 					shasum: computedShasum,
 					tarballFilename: res.stderrTarballFilename,
 					tarballPath: parsedTarballPath,
 					extPath: extPath,
 					pkg: res.pkg,
 					apiVersion: res.apiVersion
-				}
+				})
 			})
 		})
 		.catch((err) => {

diff --git a/extensions/disable-apple-quarantine/package.json b/extensions/disable-apple-quarantine/package.json
@@ -61,5 +61,6 @@
 	"files": [
 		"./dist",
 		".gitignore"
-	]
+	],
+	"packageManager": "pnpm@9.10.0+sha512.73a29afa36a0d092ece5271de5177ecbf8318d454ecd701343131b8ebc0c1a91c487da46ab77c8e596d6acf1461e3594ced4becedf8921b074fbd8653ed7051c"
 }
diff --git a/extensions/letterboxd/package.json b/extensions/letterboxd/package.json
@@ -49,5 +49,6 @@
   "files": [
     "./dist",
     ".gitignore"
-  ]
-}
+  ],
+  "packageManager": "pnpm@9.10.0+sha512.73a29afa36a0d092ece5271de5177ecbf8318d454ecd701343131b8ebc0c1a91c487da46ab77c8e596d6acf1461e3594ced4becedf8921b074fbd8653ed7051c"
+}
diff --git a/extensions/system-info/package.json b/extensions/system-info/package.json
@@ -60,5 +60,6 @@
 	"files": [
 		"./dist",
 		".gitignore"
-	]
+	],
+	"packageManager": "pnpm@9.10.0+sha512.73a29afa36a0d092ece5271de5177ecbf8318d454ecd701343131b8ebc0c1a91c487da46ab77c8e596d6acf1461e3594ced4becedf8921b074fbd8653ed7051c"
 }