docker/actions-toolkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22 from crazy-max/fix-buildx-install
Some checks failed
publish / publish (push) Has been cancelled
Details

Browse Source 
buildx: use correct url for getRelease
This commit is contained in:
CrazyMax
2023-02-02 17:21:34 +01:00
committed by GitHub
parent 63427f8ff1 87a4161671
commit 7d5ed416da
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
__tests__/buildx/install.test.ts
View File

@@ -97,6 +97,6 @@ describe('getRelease', () => {
}); });
it('unknown release', async () => { it('unknown release', async () => {
await expect(Install.getRelease('foo')).rejects.toThrowError(new Error('Cannot find Buildx release foo in https://raw.githubusercontent.com/docker/buildx/master/.github/releases.json')); await expect(Install.getRelease('foo')).rejects.toThrowError(new Error('Cannot find Buildx release foo in https://raw.githubusercontent.com/docker/actions-toolkit/main/.github/buildx-releases.json'));
}); });
}); });

7
src/buildx/install.ts
View File

@@ -54,7 +54,7 @@ export class Install {
return this.setPlugin(toolPath, dest); return this.setPlugin(toolPath, dest);
} }
public async setStandalone(toolPath: string, dest: string): Promise<string> { private async setStandalone(toolPath: string, dest: string): Promise<string> {
const toolBinPath = path.join(toolPath, os.platform() == 'win32' ? 'docker-buildx.exe' : 'docker-buildx'); const toolBinPath = path.join(toolPath, os.platform() == 'win32' ? 'docker-buildx.exe' : 'docker-buildx');
const binDir = path.join(dest, 'bin'); const binDir = path.join(dest, 'bin');
if (!fs.existsSync(binDir)) { if (!fs.existsSync(binDir)) {
@@ -68,7 +68,7 @@ export class Install {
return buildxPath; return buildxPath;
} }
public async setPlugin(toolPath: string, dest: string): Promise<string> { private async setPlugin(toolPath: string, dest: string): Promise<string> {
const toolBinPath = path.join(toolPath, os.platform() == 'win32' ? 'docker-buildx.exe' : 'docker-buildx'); const toolBinPath = path.join(toolPath, os.platform() == 'win32' ? 'docker-buildx.exe' : 'docker-buildx');
const pluginsDir: string = path.join(dest, 'cli-plugins'); const pluginsDir: string = path.join(dest, 'cli-plugins');
if (!fs.existsSync(pluginsDir)) { if (!fs.existsSync(pluginsDir)) {
@@ -124,8 +124,7 @@ export class Install {
} }
public static async getRelease(version: string): Promise<GitHubRelease> { public static async getRelease(version: string): Promise<GitHubRelease> {
// FIXME: Use https://raw.githubusercontent.com/docker/actions-toolkit/main/.github/buildx-releases.json when repo public const url = `https://raw.githubusercontent.com/docker/actions-toolkit/main/.github/buildx-releases.json`;
const url = `https://raw.githubusercontent.com/docker/buildx/master/.github/releases.json`;
const http: httpm.HttpClient = new httpm.HttpClient('docker-actions-toolkit'); const http: httpm.HttpClient = new httpm.HttpClient('docker-actions-toolkit');
const resp: httpm.HttpClientResponse = await http.get(url); const resp: httpm.HttpClientResponse = await http.get(url);
const body = await resp.readBody(); const body = await resp.readBody();