mirror of
https://github.com/docker/build-push-action.git
synced 2025-05-19 00:06:36 +00:00
Merge 2257560108
into 14487ce63c
This commit is contained in:
commit
0e59ada9f9
2
dist/index.js
generated
vendored
2
dist/index.js
generated
vendored
File diff suppressed because one or more lines are too long
2
dist/index.js.map
generated
vendored
2
dist/index.js.map
generated
vendored
File diff suppressed because one or more lines are too long
18
src/main.ts
18
src/main.ts
@ -50,7 +50,7 @@ actionsToolkit.run(
|
|||||||
let dockerConfig: ConfigFile | undefined;
|
let dockerConfig: ConfigFile | undefined;
|
||||||
let dockerConfigMalformed = false;
|
let dockerConfigMalformed = false;
|
||||||
try {
|
try {
|
||||||
dockerConfig = await Docker.configFile();
|
dockerConfig = Docker.configFile();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
dockerConfigMalformed = true;
|
dockerConfigMalformed = true;
|
||||||
core.warning(`Unable to parse config file ${path.join(Docker.configDir, 'config.json')}: ${e}`);
|
core.warning(`Unable to parse config file ${path.join(Docker.configDir, 'config.json')}: ${e}`);
|
||||||
@ -86,6 +86,9 @@ actionsToolkit.run(
|
|||||||
await core.group(`Builder info`, async () => {
|
await core.group(`Builder info`, async () => {
|
||||||
builder = await toolkit.builder.inspect(inputs.builder);
|
builder = await toolkit.builder.inspect(inputs.builder);
|
||||||
core.info(JSON.stringify(builder, null, 2));
|
core.info(JSON.stringify(builder, null, 2));
|
||||||
|
if (builder && builder.driver) {
|
||||||
|
stateHelper.setBuilderDriver(builder.driver);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
const args: string[] = await context.getArgs(inputs, toolkit);
|
const args: string[] = await context.getArgs(inputs, toolkit);
|
||||||
@ -173,8 +176,6 @@ actionsToolkit.run(
|
|||||||
core.info('Build summary is not yet supported on GHES');
|
core.info('Build summary is not yet supported on GHES');
|
||||||
} else if (!(await toolkit.buildx.versionSatisfies('>=0.13.0'))) {
|
} else if (!(await toolkit.buildx.versionSatisfies('>=0.13.0'))) {
|
||||||
core.info('Build summary requires Buildx >= 0.13.0');
|
core.info('Build summary requires Buildx >= 0.13.0');
|
||||||
} else if (builder && builder.driver === 'cloud') {
|
|
||||||
core.info('Build summary is not yet supported with Docker Build Cloud');
|
|
||||||
} else if (!ref) {
|
} else if (!ref) {
|
||||||
core.info('Build summary requires a build reference');
|
core.info('Build summary requires a build reference');
|
||||||
} else {
|
} else {
|
||||||
@ -189,7 +190,7 @@ actionsToolkit.run(
|
|||||||
},
|
},
|
||||||
// post
|
// post
|
||||||
async () => {
|
async () => {
|
||||||
if (stateHelper.isSummarySupported) {
|
if (stateHelper.isSummarySupported && stateHelper.builderDriver !== 'cloud') {
|
||||||
await core.group(`Generating build summary`, async () => {
|
await core.group(`Generating build summary`, async () => {
|
||||||
try {
|
try {
|
||||||
const recordUploadEnabled = buildRecordUploadEnabled();
|
const recordUploadEnabled = buildRecordUploadEnabled();
|
||||||
@ -222,7 +223,16 @@ actionsToolkit.run(
|
|||||||
core.warning(e.message);
|
core.warning(e.message);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
} else if (stateHelper.isSummarySupported && stateHelper.builderDriver === 'cloud') {
|
||||||
|
const [, platform, refId] = stateHelper.buildRef.split('/');
|
||||||
|
await GitHub.writeCloudSummary([
|
||||||
|
{
|
||||||
|
platform: platform,
|
||||||
|
refId: refId
|
||||||
}
|
}
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
if (stateHelper.tmpDir.length > 0) {
|
if (stateHelper.tmpDir.length > 0) {
|
||||||
await core.group(`Removing temp folder ${stateHelper.tmpDir}`, async () => {
|
await core.group(`Removing temp folder ${stateHelper.tmpDir}`, async () => {
|
||||||
try {
|
try {
|
||||||
|
@ -7,6 +7,7 @@ import {Inputs} from './context';
|
|||||||
export const tmpDir = process.env['STATE_tmpDir'] || '';
|
export const tmpDir = process.env['STATE_tmpDir'] || '';
|
||||||
export const buildRef = process.env['STATE_buildRef'] || '';
|
export const buildRef = process.env['STATE_buildRef'] || '';
|
||||||
export const isSummarySupported = !!process.env['STATE_isSummarySupported'];
|
export const isSummarySupported = !!process.env['STATE_isSummarySupported'];
|
||||||
|
export const builderDriver = process.env['STATE_builderDriver'] || '';
|
||||||
export const summaryInputs = process.env['STATE_summaryInputs'] ? JSON.parse(process.env['STATE_summaryInputs']) : undefined;
|
export const summaryInputs = process.env['STATE_summaryInputs'] ? JSON.parse(process.env['STATE_summaryInputs']) : undefined;
|
||||||
|
|
||||||
export function setTmpDir(tmpDir: string) {
|
export function setTmpDir(tmpDir: string) {
|
||||||
@ -21,6 +22,10 @@ export function setSummarySupported() {
|
|||||||
core.saveState('isSummarySupported', 'true');
|
core.saveState('isSummarySupported', 'true');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function setBuilderDriver(driver: string) {
|
||||||
|
core.saveState('builderDriver', driver);
|
||||||
|
}
|
||||||
|
|
||||||
export function setSummaryInputs(inputs: Inputs) {
|
export function setSummaryInputs(inputs: Inputs) {
|
||||||
const res = {};
|
const res = {};
|
||||||
for (const key of Object.keys(inputs)) {
|
for (const key of Object.keys(inputs)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user