Merge pull request #62 from stuartleeks/sl/silent-buildx-check

Suppress buildx check output

azdo-task/DevContainerBuildRun/src/docker.ts

@@ -1,6 +1,6 @@
 import * as task from 'azure-pipelines-task-lib/task'
 import * as docker from '../../../common/src/docker'
-import {exec} from './exec'
+import {exec, execSilent} from './exec'
 
 export async function isDockerBuildXInstalled(): Promise<boolean> {
 	return await docker.isDockerBuildXInstalled(exec)
@@ -12,7 +12,7 @@ export async function buildImage(
 ): Promise<boolean> {
 	console.log('🏗 Building dev container...')
 	try {
-		await docker.buildImage(exec, imageName, checkoutPath, subFolder)
+		await docker.buildImage(execSilent, imageName, checkoutPath, subFolder)
 		return true
 	} catch (error) {
 		task.setResult(task.TaskResult.Failed, error)

azdo-task/DevContainerBuildRun/src/exec.ts

@@ -3,7 +3,16 @@ import * as task from 'azure-pipelines-task-lib/task'
 export async function exec(command: string, args: string[]): Promise<number> {
 	const exitCode = await task.exec(command, args, {
 		failOnStdErr: false,
-		silent: false, // TODO add execSilent for BuildX install check
+		silent: false,
+		ignoreReturnCode: true
+	})
+
+	return exitCode
+}
+export async function execSilent(command: string, args: string[]): Promise<number> {
+	const exitCode = await task.exec(command, args, {
+		failOnStdErr: false,
+		silent: true,
 		ignoreReturnCode: true
 	})
 

github-action/lib/docker.js

@@ -34,7 +34,7 @@ const docker = __importStar(require("../../common/src/docker"));
 const exec_1 = require("./exec");
 function isDockerBuildXInstalled() {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield docker.isDockerBuildXInstalled(exec_1.exec);
+        return yield docker.isDockerBuildXInstalled(exec_1.execSilent);
     });
 }
 exports.isDockerBuildXInstalled = isDockerBuildXInstalled;

github-action/lib/exec.js

@@ -28,7 +28,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.exec = void 0;
+exports.execSilent = exports.exec = void 0;
 const actions_exec = __importStar(require("@actions/exec"));
 function exec(command, args) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -41,3 +41,14 @@ function exec(command, args) {
     });
 }
 exports.exec = exec;
+function execSilent(command, args) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const actionOptions = {
+            ignoreReturnCode: true,
+            silent: true
+        };
+        const exitCode = yield actions_exec.exec(command, args, actionOptions);
+        return exitCode;
+    });
+}
+exports.execSilent = execSilent;

github-action/src/docker.ts

@@ -1,11 +1,10 @@
 import * as core from '@actions/core'
-import {check} from 'prettier'
 import * as docker from '../../common/src/docker'
-import {exec} from './exec'
+import {exec, execSilent} from './exec'
 
 
 export async function isDockerBuildXInstalled(): Promise<boolean> {
-	return await docker.isDockerBuildXInstalled(exec)
+	return await docker.isDockerBuildXInstalled(execSilent)
 }
 export async function buildImage(
 	imageName: string,

github-action/src/exec.ts

@@ -13,3 +13,17 @@ export async function exec(
 
 	return exitCode;
 }
+
+export async function execSilent(
+	command: string,
+	args: string[]
+): Promise<number> {
+
+	const actionOptions: actions_exec.ExecOptions = {
+		ignoreReturnCode: true,
+		silent: true
+	}
+	const exitCode = await actions_exec.exec(command, args, actionOptions)
+
+	return exitCode;
+}