some debug logs

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax 2023-02-18 04:36:14 +01:00
parent d9984214c9
commit 847887b312
No known key found for this signature in database
GPG Key ID: 3248E46B6BB8C7F7
3 changed files with 18 additions and 8 deletions

View File

@ -16,6 +16,7 @@
import fs from 'fs'; import fs from 'fs';
import path from 'path'; import path from 'path';
import * as core from '@actions/core';
import * as exec from '@actions/exec'; import * as exec from '@actions/exec';
import * as semver from 'semver'; import * as semver from 'semver';
@ -123,9 +124,12 @@ export class Buildx {
public async versionSatisfies(range: string, version?: string): Promise<boolean> { public async versionSatisfies(range: string, version?: string): Promise<boolean> {
const ver = version ?? (await this.version); const ver = version ?? (await this.version);
if (!ver) { if (!ver) {
core.debug(`Buildx.versionSatisfies false: undefined version`);
return false; return false;
} }
return semver.satisfies(ver, range) || /^[0-9a-f]{7}$/.exec(ver) !== null; const res = semver.satisfies(ver, range) || /^[0-9a-f]{7}$/.exec(ver) !== null;
core.debug(`Buildx.versionSatisfies ${ver} statisfies ${range}: ${res}`);
return res;
} }
public static resolveCertsDriverOpts(driver: string, endpoint: string, cert: Cert): Array<string> { public static resolveCertsDriverOpts(driver: string, endpoint: string, cert: Cert): Array<string> {

View File

@ -80,7 +80,7 @@ export class Install {
} else { } else {
vspec = await Git.getRemoteSha(repo, ref); vspec = await Git.getRemoteSha(repo, ref);
} }
core.debug(`Tool version spec ${vspec}`); core.debug(`Install.build: tool version spec ${vspec}`);
let toolPath: string; let toolPath: string;
toolPath = tc.find('buildx', vspec); toolPath = tc.find('buildx', vspec);
@ -112,16 +112,16 @@ export class Install {
let buildStandalone = false; let buildStandalone = false;
if (this.standalone && buildxStandaloneFound) { if (this.standalone && buildxStandaloneFound) {
core.debug(`Buildx standalone found, build with it`); core.debug(`Install.buildCommand: Buildx standalone found, build with it`);
buildStandalone = true; buildStandalone = true;
} else if (!this.standalone && buildxPluginFound) { } else if (!this.standalone && buildxPluginFound) {
core.debug(`Buildx plugin found, build with it`); core.debug(`Install.buildCommand: Buildx plugin found, build with it`);
buildStandalone = false; buildStandalone = false;
} else if (buildxStandaloneFound) { } else if (buildxStandaloneFound) {
core.debug(`Buildx plugin not found, but standalone found so trying to build with it`); core.debug(`Install.buildCommand: Buildx plugin not found, but standalone found so trying to build with it`);
buildStandalone = true; buildStandalone = true;
} else if (buildxPluginFound) { } else if (buildxPluginFound) {
core.debug(`Buildx standalone not found, but plugin found so trying to build with it`); core.debug(`Install.buildCommand: Buildx standalone not found, but plugin found so trying to build with it`);
buildStandalone = false; buildStandalone = false;
} else { } else {
throw new Error(`Neither buildx standalone or plugin have been found to build from ref ${gitContext}`); throw new Error(`Neither buildx standalone or plugin have been found to build from ref ${gitContext}`);

View File

@ -16,6 +16,7 @@
import os from 'os'; import os from 'os';
import path from 'path'; import path from 'path';
import * as core from '@actions/core';
import * as exec from '@actions/exec'; import * as exec from '@actions/exec';
export class Docker { export class Docker {
@ -32,21 +33,25 @@ export class Docker {
}) })
.then(res => { .then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.stderr.length > 0 && res.exitCode != 0) {
core.debug(`Docker.isAvailable error: ${res.stderr}`);
dockerAvailable = false; dockerAvailable = false;
} else { } else {
core.debug(`Docker.isAvailable ok`);
dockerAvailable = res.exitCode == 0; dockerAvailable = res.exitCode == 0;
} }
}) })
// eslint-disable-next-line @typescript-eslint/no-unused-vars // eslint-disable-next-line @typescript-eslint/no-unused-vars
.catch(error => { .catch(error => {
core.debug(`Docker.isAvailable failed: ${error}`);
dockerAvailable = false; dockerAvailable = false;
}); });
return dockerAvailable; return dockerAvailable;
} }
public static async printVersion(standalone?: boolean) { public static async printVersion(standalone?: boolean): Promise<void> {
const noDocker = standalone ?? !Docker.isAvailable; const noDocker = standalone ?? !Docker.isAvailable;
if (noDocker) { if (noDocker) {
core.debug('Docker.printVersion: Docker is not available, skipping.');
return; return;
} }
await exec.exec('docker', ['version'], { await exec.exec('docker', ['version'], {
@ -54,9 +59,10 @@ export class Docker {
}); });
} }
public static async printInfo(standalone?: boolean) { public static async printInfo(standalone?: boolean): Promise<void> {
const noDocker = standalone ?? !Docker.isAvailable; const noDocker = standalone ?? !Docker.isAvailable;
if (noDocker) { if (noDocker) {
core.debug('Docker.printInfo: Docker is not available, skipping.');
return; return;
} }
await exec.exec('docker', ['info'], { await exec.exec('docker', ['info'], {