actions
/
docker-build-push
mirror of https://github.com/docker/build-push-action.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #400 from crazy-max/typo 

Small typo and ensure trimmed output
pull/407/head v2.6.1
CrazyMax 2021-07-01 16:59:39 +02:00 committed by GitHub
parent 0987321e12 fcaaa5e487
commit 1bc1040cae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/index.js generated vendored
View File

@ -152,7 +152,7 @@ function getVersion() {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(res.stderr.trim()); throw new Error(res.stderr.trim());
} }
return parseVersion(res.stdout); return parseVersion(res.stdout.trim());
}); });
}); });
} }
@ -473,7 +473,7 @@ function run() {
}) })
.then(res => { .then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(`buildx bake failed with: ${res.stderr.match(/(.*)\s*$/)[0].trim()}`); throw new Error(`buildx failed with: ${res.stderr.match(/(.*)\s*$/)[0].trim()}`);
} }
}); });
const imageID = yield buildx.getImageID(); const imageID = yield buildx.getImageID();

2
src/buildx.ts
View File

@ -103,7 +103,7 @@ export async function getVersion(): Promise<string> {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(res.stderr.trim()); throw new Error(res.stderr.trim());
} }
return parseVersion(res.stdout); return parseVersion(res.stdout.trim());
}); });
} }

2
src/main.ts
View File

@ -29,7 +29,7 @@ async function run(): Promise<void> {
}) })
.then(res => { .then(res => {
if (res.stderr.length > 0 && res.exitCode != 0) { if (res.stderr.length > 0 && res.exitCode != 0) {
throw new Error(`buildx bake failed with: ${res.stderr.match(/(.*)\s*$/)![0].trim()}`); throw new Error(`buildx failed with: ${res.stderr.match(/(.*)\s*$/)![0].trim()}`);
} }
}); });