feat: use shorthened git commit id, change output variable to version…

… tag
specklesystems · Sep 18, 2023 · ea219de · ea219de
1 parent 4599eff
commit ea219de
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/dist/action/index.js b/dist/action/index.js
diff --git a/dist/action/index.js.map b/dist/action/index.js.map
diff --git a/src/main.ts b/src/main.ts
@@ -92,12 +92,13 @@ const registerNewVersionForTheSpeckleAutomateFunction = async (
     speckleFunctionInputSchema,
     speckleToken
   }: InputVariables,
-  { gitCommitSha, gitRefName, gitRefType }: RequiredEnvVars
+  { commitId, versionTag }: { commitId: string; versionTag: string }
+  // { gitCommitSha, gitRefName, gitRefType }: RequiredEnvVars
 ): Promise<FunctionVersionResponseBody> => {
   try {
     const requestBody: FunctionVersionRequestBody = {
-      commitId: gitCommitSha,
-      versionTag: gitRefType === 'tag' ? gitRefName : gitCommitSha,
+      commitId,
+      versionTag,
       command: speckleFunctionCommand,
       inputSchema: speckleFunctionInputSchema
     }
@@ -156,6 +157,7 @@ export async function run(): Promise<void> {
   const inputVariables = parseInputs()
   core.info(`Parsed input variables to: ${JSON.stringify(inputVariables)}`)
   const requiredEnvVars = parseEnvVars()
+  const { gitCommitSha, gitRefName, gitRefType } = requiredEnvVars
   core.info(
     `Parsed required environment variables to: ${JSON.stringify(requiredEnvVars)}`
   )
@@ -166,12 +168,16 @@ export async function run(): Promise<void> {
     `Sending a new function version definition for function ${speckleFunctionId} to the automate server: ${speckleAutomateUrl}`
   )
 
+  // github uses 7 chars to identify commits
+  const commitId = gitCommitSha.substring(0, 7)
+  const versionTag = gitRefType === 'tag' ? gitRefName : commitId
+
   const { versionId } = await registerNewVersionForTheSpeckleAutomateFunction(
     inputVariables,
-    requiredEnvVars
+    { versionTag, commitId }
   )
-  core.setOutput('version_id', versionId)
   core.info(`Registered function version with new id: ${versionId}`)
+  core.setOutput('version_tag', versionTag)
 }
 
 run()