docker/build-push-action
1
0
Fork 0
mirror of https://github.com/docker/build-push-action.git synced 2025-05-20 08:54:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #65 from useblacksmith/fix-conditional

Browse Source 
src: fix bug in conditional that zero'd out expose ID
This commit is contained in:
Aditya Maru 2024-12-08 18:51:55 -05:00 committed by GitHub
commit 1cc1561946
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/index.js generated vendored
View File

File diff suppressed because one or more lines are too long

2
dist/index.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

8
src/setup_builder.ts
View File

@ -165,11 +165,9 @@ async function getStickyDisk(retryCondition: (error: AxiosError) => boolean, opt
core.debug(`${pair[0]}: ${pair[1]}`); core.debug(`${pair[0]}: ${pair[1]}`);
} }
const response = await reporter.getWithRetry(client, '/stickydisks', formData, retryCondition, options); const response = await reporter.getWithRetry(client, '/stickydisks', formData, retryCondition, options);
// For backward compatibility, if expose_id is set, return it const exposeId = response.data?.expose_id || '';
if (response.data?.expose_id && response.data?.disk_identifier) { const device = response.data?.disk_identifier || '';
return {expose_id: response.data.expose_id, device: response.data.disk_identifier}; return {expose_id: exposeId, device: device};
}
return {expose_id: '', device: ''};
} }
export async function startAndConfigureBuildkitd(parallelism: number, device: string): Promise<string> { export async function startAndConfigureBuildkitd(parallelism: number, device: string): Promise<string> {