From ca609901bd6dbb5f98dd409a46a2f1491cc1358a Mon Sep 17 00:00:00 2001 From: Giulio Micheloni Date: Mon, 8 May 2023 21:03:51 +0200 Subject: [PATCH] main: ignore error code for buildx inspect --- dist/main/index.js | 4 ++-- main.ts | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dist/main/index.js b/dist/main/index.js index 50074f5..7d291b2 100644 --- a/dist/main/index.js +++ b/dist/main/index.js @@ -4385,7 +4385,7 @@ Please add a step this step to your workflow's job definition: function prepareBuildx() { return __awaiter(this, void 0, void 0, function* () { try { - yield core.group(`Check if Namespace Cloud Remote Builder`, () => __awaiter(this, void 0, void 0, function* () { + yield core.group(`Ensure Namespace Builder proxy is already configured`, () => __awaiter(this, void 0, void 0, function* () { const builderExists = yield remoteNscBuilderExists(); if (builderExists) { core.info(` @@ -4424,7 +4424,7 @@ function ensureNscloudToken() { } function remoteNscBuilderExists() { return __awaiter(this, void 0, void 0, function* () { - const { stdout, stderr } = yield exec.getExecOutput(`docker buildx inspect ${nscRemoteBuilderName}`); + const { stdout, stderr } = yield exec.getExecOutput(`docker buildx inspect ${nscRemoteBuilderName}`, null, { ignoreReturnCode: true, silent: true }); const builderNotFoundStr = `no builder "${nscRemoteBuilderName}" found`; return !(stdout.includes(builderNotFoundStr) || stderr.includes(builderNotFoundStr)); }); diff --git a/main.ts b/main.ts index fd9a5c6..a334ecc 100644 --- a/main.ts +++ b/main.ts @@ -21,7 +21,7 @@ Please add a step this step to your workflow's job definition: async function prepareBuildx(): Promise { try { - await core.group(`Check if Namespace Cloud Remote Builder`, async () => { + await core.group(`Ensure Namespace Builder proxy is already configured`, async () => { const builderExists = await remoteNscBuilderExists(); if (builderExists) { core.info(` @@ -68,7 +68,9 @@ async function ensureNscloudToken() { } async function remoteNscBuilderExists(): Promise { - const { stdout, stderr } = await exec.getExecOutput(`docker buildx inspect ${nscRemoteBuilderName}`); + const { stdout, stderr } = await exec.getExecOutput( + `docker buildx inspect ${nscRemoteBuilderName}`, + null, {ignoreReturnCode: true, silent: true}); const builderNotFoundStr = `no builder "${nscRemoteBuilderName}" found`; return !(stdout.includes(builderNotFoundStr) || stderr.includes(builderNotFoundStr)) }