Merge pull request #113 from stuartleeks/sl/separate-run-steps

Split main/post steps
devcontainers · May 23, 2022 · cf4dfbf · cf4dfbf
2 parents d08e604 + 1b9cf7b
commit cf4dfbf
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 94 deletions.
diff --git a/action.yml b/action.yml
@@ -43,6 +43,6 @@ inputs:
     description: For non-root dev containers (i.e. where `remoteUser` is specified), the action attempts to make the container user UID and GID match those of the host user. Set this to true to skip this step (defaults to false)
 runs:
   using: 'node16'
-  main: 'github-action/dist/index.js'
-  post: 'github-action/dist/index.js'
+  main: 'github-action/run-main.js'
+  post: 'github-action/run-post.js'
   post-if: 'success()'
diff --git a/azdo-task/DevContainerBuildRun/dist/index.js b/azdo-task/DevContainerBuildRun/dist/index.js
@@ -220,32 +220,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
+exports.runPost = exports.runMain = void 0;
 const task = __importStar(__nccwpck_require__(347));
 const task_1 = __nccwpck_require__(347);
 const path_1 = __importDefault(__nccwpck_require__(5622));
 const envvars_1 = __nccwpck_require__(9243);
 const dev_container_cli_1 = __nccwpck_require__(4624);
 const docker_1 = __nccwpck_require__(3758);
 const exec_1 = __nccwpck_require__(7757);
-function run() {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log('DevContainerBuildRun starting...');
-        const hasRunMain = task.getTaskVariable('hasRunMain');
-        if (hasRunMain === 'true') {
-            console.log('DevContainerBuildRun running post step...');
-            return yield runPost();
-        }
-        else {
-            console.log('DevContainerBuildRun running main step...');
-            task.setTaskVariable('hasRunMain', 'true');
-            return yield runMain();
-        }
-    });
-}
 function runMain() {
     var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
         try {
+            task.setTaskVariable('hasRunMain', 'true');
             const buildXInstalled = yield docker_1.isDockerBuildXInstalled();
             if (!buildXInstalled) {
                 console.log('### WARNING: docker buildx not available: add a step to set up with docker/setup-buildx-action - see https://github.com/stuartleeks/devcontainer-build-run/blob/main/docs/azure-devops-task.md');
@@ -345,6 +332,7 @@ function runMain() {
         }
     });
 }
+exports.runMain = runMain;
 function runPost() {
     var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function* () {
@@ -395,7 +383,7 @@ function runPost() {
         yield docker_1.pushImage(imageName, imageTag);
     });
 }
-run();
+exports.runPost = runPost;
 
 
 /***/ }),

diff --git a/azdo-task/DevContainerBuildRun/dist/index.js.map b/azdo-task/DevContainerBuildRun/dist/index.js.map
diff --git a/azdo-task/DevContainerBuildRun/lib/main.js b/azdo-task/DevContainerBuildRun/lib/main.js
@@ -31,32 +31,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.runPost = exports.runMain = void 0;
 const task = __importStar(require("azure-pipelines-task-lib/task"));
 const task_1 = require("azure-pipelines-task-lib/task");
 const path_1 = __importDefault(require("path"));
 const envvars_1 = require("../../../common/src/envvars");
 const dev_container_cli_1 = require("../../../common/src/dev-container-cli");
 const docker_1 = require("./docker");
 const exec_1 = require("./exec");
-function run() {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log('DevContainerBuildRun starting...');
-        const hasRunMain = task.getTaskVariable('hasRunMain');
-        if (hasRunMain === 'true') {
-            console.log('DevContainerBuildRun running post step...');
-            return yield runPost();
-        }
-        else {
-            console.log('DevContainerBuildRun running main step...');
-            task.setTaskVariable('hasRunMain', 'true');
-            return yield runMain();
-        }
-    });
-}
 function runMain() {
     var _a, _b, _c, _d, _e, _f, _g;
     return __awaiter(this, void 0, void 0, function* () {
         try {
+            task.setTaskVariable('hasRunMain', 'true');
             const buildXInstalled = yield docker_1.isDockerBuildXInstalled();
             if (!buildXInstalled) {
                 console.log('### WARNING: docker buildx not available: add a step to set up with docker/setup-buildx-action - see https://github.com/stuartleeks/devcontainer-build-run/blob/main/docs/azure-devops-task.md');
@@ -156,6 +143,7 @@ function runMain() {
         }
     });
 }
+exports.runMain = runMain;
 function runPost() {
     var _a, _b, _c, _d, _e, _f;
     return __awaiter(this, void 0, void 0, function* () {
@@ -206,4 +194,4 @@ function runPost() {
         yield docker_1.pushImage(imageName, imageTag);
     });
 }
-run();
+exports.runPost = runPost;
diff --git a/azdo-task/DevContainerBuildRun/run-main.js b/azdo-task/DevContainerBuildRun/run-main.js
@@ -0,0 +1,3 @@
+const { runMain } = require("./dist/index.js");
+
+runMain();
diff --git a/azdo-task/DevContainerBuildRun/run-post.js b/azdo-task/DevContainerBuildRun/run-post.js
@@ -0,0 +1,3 @@
+const { runPost } = require("./dist/index.js");
+
+runPost();
diff --git a/azdo-task/DevContainerBuildRun/src/main.ts b/azdo-task/DevContainerBuildRun/src/main.ts
@@ -12,21 +12,9 @@ import {
 import {isDockerBuildXInstalled, pushImage} from './docker'
 import {exec} from './exec'
 
-async function run(): Promise<void> {
-	console.log('DevContainerBuildRun starting...')
-	const hasRunMain = task.getTaskVariable('hasRunMain')
-	if (hasRunMain === 'true') {
-		console.log('DevContainerBuildRun running post step...')
-		return await runPost()
-	} else {
-		console.log('DevContainerBuildRun running main step...')
-		task.setTaskVariable('hasRunMain', 'true')
-		return await runMain()
-	}
-}
-
-async function runMain(): Promise<void> {
+export async function runMain(): Promise<void> {
 	try {
+		task.setTaskVariable('hasRunMain', 'true')
 		const buildXInstalled = await isDockerBuildXInstalled()
 		if (!buildXInstalled) {
 			console.log(
@@ -143,7 +131,7 @@ async function runMain(): Promise<void> {
 	}
 }
 
-async function runPost(): Promise<void> {
+export async function runPost(): Promise<void> {
 	const pushOption = task.getInput('push') ?? 'filter'
 	const pushOnFailedBuild =
 		(task.getInput('pushOnFailedBuild') ?? 'false') === 'true'
@@ -209,5 +197,3 @@ async function runPost(): Promise<void> {
 	console.log(`Pushing image ''${imageName}:${imageTag ?? 'latest'}...`)
 	await pushImage(imageName, imageTag)
 }
-
-run()
diff --git a/azdo-task/DevContainerBuildRun/task.json b/azdo-task/DevContainerBuildRun/task.json
@@ -98,13 +98,13 @@
   "outputVariables": [],
   "execution": {
     "Node10": {
-      "target": "dist/index.js",
+      "target": "run-main.js",
       "argumentFormat": ""
     }
   },
   "postjobexecution": {
     "Node10": {
-      "target": "dist/index.js",
+      "target": "run-post.js",
       "argumentFormat": ""
     }
   }

diff --git a/github-action/dist/index.js b/github-action/dist/index.js
diff --git a/github-action/dist/index.js.map b/github-action/dist/index.js.map
diff --git a/github-action/lib/main.js b/github-action/lib/main.js
@@ -31,28 +31,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.runPost = exports.runMain = void 0;
 const core = __importStar(require("@actions/core"));
 const path_1 = __importDefault(require("path"));
 const exec_1 = require("./exec");
 const dev_container_cli_1 = require("../../common/src/dev-container-cli");
 const docker_1 = require("./docker");
 const envvars_1 = require("../../common/src/envvars");
-function run() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const hasRunMain = core.getState('hasRunMain');
-        if (hasRunMain === 'true') {
-            return yield runPost();
-        }
-        else {
-            core.saveState('hasRunMain', 'true');
-            return yield runMain();
-        }
-    });
-}
 function runMain() {
     return __awaiter(this, void 0, void 0, function* () {
         try {
             core.info('Starting...');
+            core.saveState('hasRunMain', 'true');
             const buildXInstalled = yield docker_1.isDockerBuildXInstalled();
             if (!buildXInstalled) {
                 core.warning('docker buildx not available: add a step to set up with docker/setup-buildx-action - see https://github.com/stuartleeks/devcontainer-build-run/blob/main/docs/github-action.md');
@@ -142,6 +132,7 @@ function runMain() {
         }
     });
 }
+exports.runMain = runMain;
 function runPost() {
     return __awaiter(this, void 0, void 0, function* () {
         const pushOption = valueOrDefault(core.getInput('push'), 'filter');
@@ -176,6 +167,7 @@ function runPost() {
         yield docker_1.pushImage(imageName, imageTag);
     });
 }
+exports.runPost = runPost;
 function valueOrDefault(value, defaultValue) {
     if (!value || value === '') {
         return defaultValue;
@@ -188,4 +180,3 @@ function emptyStringAsUndefined(value) {
     }
     return value;
 }
-run();
diff --git a/github-action/run-main.js b/github-action/run-main.js
@@ -0,0 +1,3 @@
+const { runMain } = require("./dist/index.js");
+
+runMain();
diff --git a/github-action/run-post.js b/github-action/run-post.js
@@ -0,0 +1,3 @@
+const { runPost } = require("./dist/index.js");
+
+runPost();
diff --git a/github-action/src/main.ts b/github-action/src/main.ts
@@ -11,18 +11,10 @@ import {
 import {isDockerBuildXInstalled, pushImage} from './docker'
 import {populateDefaults} from '../../common/src/envvars'
 
-async function run(): Promise<void> {
-	const hasRunMain = core.getState('hasRunMain')
-	if (hasRunMain === 'true') {
-		return await runPost()
-	} else {
-		core.saveState('hasRunMain', 'true')
-		return await runMain()
-	}
-}
-async function runMain(): Promise<void> {
+export async function runMain(): Promise<void> {
 	try {
 		core.info('Starting...')
+		core.saveState('hasRunMain', 'true')
 		const buildXInstalled = await isDockerBuildXInstalled()
 		if (!buildXInstalled) {
 			core.warning(
@@ -131,7 +123,7 @@ async function runMain(): Promise<void> {
 	}
 }
 
-async function runPost(): Promise<void> {
+export async function runPost(): Promise<void> {
 	const pushOption: string = valueOrDefault(core.getInput('push'), 'filter')
 	const refFilterForPush: string[] = core.getMultilineInput('refFilterForPush')
 	const eventFilterForPush: string[] =
@@ -187,5 +179,3 @@ function emptyStringAsUndefined(value: string): string | undefined {
 	}
 	return value
 }
-
-run()
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		const { runMain } = require("./dist/index.js");

		runMain();
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		const { runPost } = require("./dist/index.js");

		runPost();