Merge pull request #40 from crazy-max/debug

some debug logs
docker · Feb 18, 2023 · 2c60cad · 2c60cad
2 parents d998421 + 847887b
commit 2c60cad
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/src/buildx/buildx.ts b/src/buildx/buildx.ts
@@ -16,6 +16,7 @@
 
 import fs from 'fs';
 import path from 'path';
+import * as core from '@actions/core';
 import * as exec from '@actions/exec';
 import * as semver from 'semver';
 
@@ -123,9 +124,12 @@ export class Buildx {
   public async versionSatisfies(range: string, version?: string): Promise<boolean> {
     const ver = version ?? (await this.version);
     if (!ver) {
+      core.debug(`Buildx.versionSatisfies false: undefined version`);
       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> {

diff --git a/src/buildx/install.ts b/src/buildx/install.ts
@@ -80,7 +80,7 @@ export class Install {
     } else {
       vspec = await Git.getRemoteSha(repo, ref);
     }
-    core.debug(`Tool version spec ${vspec}`);
+    core.debug(`Install.build: tool version spec ${vspec}`);
 
     let toolPath: string;
     toolPath = tc.find('buildx', vspec);
@@ -112,16 +112,16 @@ export class Install {
 
     let buildStandalone = false;
     if (this.standalone && buildxStandaloneFound) {
-      core.debug(`Buildx standalone found, build with it`);
+      core.debug(`Install.buildCommand: Buildx standalone found, build with it`);
       buildStandalone = true;
     } 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;
     } 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;
     } 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;
     } else {
       throw new Error(`Neither buildx standalone or plugin have been found to build from ref ${gitContext}`);

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