Split main and post actions into separate scripts

Author: DaRosenberg

.github/workflows/build.yml

@@ -2,22 +2,36 @@ name: Build
 
 on:
   push:
-    paths-ignore:
-      - dist/**
+    paths:
+      - "**/*.ts"
+      - "package.json"
+      - "tsconfig.json"
+      - ".github/workflows/build.yml"
 
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - run: npm i -g @vercel/ncc
-      - run: npm install
-      - run: ncc build index.ts --license licenses.txt
+      - name: Install
+        run: |
+          npm i -g @vercel/ncc
+          npm install
+      - name: Build
+        run: |
+          ncc build main.ts
+          mv dist/index.js dist/main.js
+          ncc build post.ts
+          mv dist/index.js dist/post.js
       - name: Commit & push
         run: |
-          git config --global user.name 'Build Workflow'
-          git config --global user.email 'defaultcommitter@orgflow.io'
-          git add --force dist/index.js
-          git add --force dist/licenses.txt
-          git commit -m "Updates distributables"
-          git push
+          git add --all
+          git add --force dist/main.js
+          git add --force dist/post.js
+          git status --porcelain
+          if [[ `git status --porcelain` ]]; then
+            git config --global user.name "Build Workflow"
+            git config --global user.email "defaultcommitter@orgflow.io"
+            git commit -m "Updates distributables"
+            git push
+          fi

.github/workflows/test.yml

@@ -1,9 +1,11 @@
-name: Test
+name: Test2
 
 on:
   push:
     paths:
-      - dist/**
+      - "**/*.js"
+      - "action.yml"
+      - ".github/workflows/test.yml"
 
 jobs:
 

.vscode/launch.json

@@ -9,7 +9,7 @@
 				"<node_internals>/**",
 				"${workspaceFolder}/node_modules/**/*.js"
 			],
-			"program": "${workspaceFolder}/index.ts",
+			"program": "${workspaceFolder}/main.ts",
 			"preLaunchTask": "tsc: build",
 			"outFiles": [
 				"${workspaceFolder}/dist/**/*.js"

action.yml

@@ -64,5 +64,5 @@ outputs:
     description: Encryption key that was saved.
 runs:
   using: node16
-  main: dist/index.js
-  post: dist/index.js
+  main: dist/main.js
+  post: dist/post.js

dist/licenses.txt

@@ -5,7 +5,9 @@
 import * as core from "@actions/core";
 import * as io from "@actions/io";
 import * as artifact from "@actions/artifact";
+import * as exec from "@actions/exec";
 import * as path from "path";
+import { readdir } from "fs/promises";
 
 const tempDirPath = process.env.RUNNER_TEMP || process.env.TMPDIR;
 const artifactRootPath = path.join(tempDirPath, "OrgFlow");
@@ -19,23 +21,45 @@ if (!tempDirPath)
 const logDirPath = path.join(artifactRootPath, "logs");
 const bundleDirPath = path.join(artifactRootPath, "bundles")
 
-console.log(`Diagnostic log directory: ${logDirPath}`);
-console.log(`Diagnostic bundle directory: ${bundleDirPath}`);
+core.debug(`Diagnostic log directory: ${logDirPath}`);
+core.debug(`Diagnostic bundle directory: ${bundleDirPath}`);
 
 export function setDiagnostics(logFileName: string, logLevel: string)
 {
 	io.mkdirP(logDirPath);
 	io.mkdirP(bundleDirPath);
 
+	const logFilePath = path.join(logDirPath, logFileName);
+
+	core.debug(`Setting ORGFLOW_DIAGNOSTICSFILEDIRECTORYPATH=${bundleDirPath}`);
+	core.debug(`Setting ORGFLOW_LOGFILEPATH=${logFilePath}`);
+
 	core.exportVariable("ORGFLOW_DIAGNOSTICBUNDLEMODE", "always");
 	core.exportVariable("ORGFLOW_DIAGNOSTICSFILEDIRECTORYPATH", bundleDirPath);
-	const logFilePath = path.join(logDirPath, logFileName);
 	core.exportVariable("ORGFLOW_LOGFILEPATH", logFilePath);
 	core.exportVariable("ORGFLOW_LOGLEVEL", logLevel);
 }
 
 export async function uploadDiagnosticsArtifact()
 {
-	const client = artifact.create();
-	await client.uploadArtifact(artifactName, [bundleDirPath, logDirPath], artifactRootPath, { continueOnError: true });
+	const { stdout } = await exec.getExecOutput("ls", ["-R", artifactRootPath], { silent: true });
+
+	core.debug(`Recursive contents of artifact root path '${artifactRootPath}':`);
+	core.debug(stdout);
+
+	const artifactFiles = [
+		...(await readdir(bundleDirPath)).map(fileName => path.join(bundleDirPath, fileName)),
+		...(await readdir(logDirPath)).map(fileName => path.join(logDirPath, fileName))
+	];
+
+	if (artifactFiles.length)
+	{
+		core.debug(`Uploading ${artifactFiles.length} artifact files: ${artifactFiles.join(", ")}`);
+		const client = artifact.create();
+		await client.uploadArtifact(artifactName, artifactFiles, artifactRootPath, { continueOnError: true });
+	}
+	else
+	{
+		core.debug("No artifact files no upload.");
+	}
 }

dist/index.js dist/main.jsdist/index.js renamed to dist/main.js

@@ -6,7 +6,7 @@ import * as core from "@actions/core";
 import { install } from "./lib/install";
 import { createEncryptionKey, saveEncryptionKey, saveSalesforceCredentials, setDefaultStack, setLicenseKey } from "./lib/cli";
 import { setCommitterEmail, setCommitterName, configureGitAuthentication } from "./lib/git";
-import { setDiagnostics, uploadDiagnosticsArtifact } from "./lib/diag";
+import { setDiagnostics } from "./lib/diag";
 
 export async function run()
 {
@@ -149,33 +149,4 @@ export async function run()
 	}
 }
 
-export async function post()
-{
-	try
-	{
-		const uploadArtifact =
-			core.getInput("upload-artifact") ? // getBooleanInput() will throw if input is not present, so guard against that
-				core.getBooleanInput("upload-artifact") :
-				true;
-
-		if (uploadArtifact)
-		{
-			await uploadDiagnosticsArtifact();
-		}
-	}
-	catch (error)
-	{
-		core.setFailed(error.message);
-	}
-}
-
-export const isPost = Boolean(process.env['STATE_isPost']);
-
-if (!isPost)
-{
-	run();
-}
-else
-{
-	post();
-}
+run();