buildx: fix version method

Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
CrazyMax
2023-02-20 09:59:44 +01:00
parent 1098847fe7
commit cb6ca3829f
2 changed files with 21 additions and 18 deletions

View File

@@ -157,7 +157,7 @@ describe('printVersion', () => {
describe('version', () => {
it('valid', async () => {
const buildx = new Buildx();
expect(semver.valid(await buildx.version)).not.toBeUndefined();
expect(semver.valid(await buildx.version())).not.toBeUndefined();
});
});

View File

@@ -30,7 +30,8 @@ export interface BuildxOpts {
}
export class Buildx {
private _version: string | undefined;
private _version: string;
private _versionOnce: boolean;
private readonly _standalone: boolean | undefined;
public readonly inputs: Inputs;
@@ -39,6 +40,8 @@ export class Buildx {
constructor(opts?: BuildxOpts) {
this._standalone = opts?.standalone;
this._version = '';
this._versionOnce = false;
this.inputs = new Inputs();
}
@@ -94,22 +97,22 @@ export class Buildx {
});
}
get version() {
return (async () => {
if (!this._version) {
const cmd = await this.getCommand(['version']);
this._version = await Exec.getExecOutput(cmd.command, cmd.args, {
ignoreReturnCode: true,
silent: true
}).then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(res.stderr.trim());
}
return Buildx.parseVersion(res.stdout.trim());
});
}
public async version(): Promise<string> {
if (this._versionOnce) {
return this._version;
})();
}
this._versionOnce = true;
const cmd = await this.getCommand(['version']);
this._version = await Exec.getExecOutput(cmd.command, cmd.args, {
ignoreReturnCode: true,
silent: true
}).then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(res.stderr.trim());
}
return Buildx.parseVersion(res.stdout.trim());
});
return this._version;
}
public async printVersion() {
@@ -128,7 +131,7 @@ export class Buildx {
}
public async versionSatisfies(range: string, version?: string): Promise<boolean> {
const ver = version ?? (await this.version);
const ver = version ?? (await this.version());
if (!ver) {
core.debug(`Buildx.versionSatisfies false: undefined version`);
return false;