Skip to content

Commit 37816e7

Browse files
crazy-maxcrazy-max
authored
Merge pull request #331 from docker/dependabot/npm_and_yarn/docker/actions-toolkit-0.62.1
chore(deps): Bump @docker/actions-toolkit from 0.61.0 to 0.62.1
2 parents 212c367 + f530412 commit 37816e7

File tree

7 files changed

+147
-75
lines changed

7 files changed

+147
-75
lines changed

‎dist/index.js‎

Lines changed: 22 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/index.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"packageManager": "yarn@3.6.3",
2828
"dependencies": {
2929
"@actions/core": "^1.11.1",
30-
"@docker/actions-toolkit": "^0.61.0",
30+
"@docker/actions-toolkit": "^0.62.1",
3131
"handlebars": "^4.7.8"
3232
},
3333
"devDependencies": {

‎src/context.ts‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,6 @@ export async function getInputs(): Promise<Inputs> {
4646
};
4747
}
4848

49-
export function sanitizeInputs(inputs: Inputs) {
50-
const res = {};
51-
for (const key of Object.keys(inputs)) {
52-
if (key === 'github-token') {
53-
continue;
54-
}
55-
const value: string | string[] | boolean = inputs[key];
56-
if (typeof value === 'boolean' && value === false) {
57-
continue;
58-
} else if (Array.isArray(value) && value.length === 0) {
59-
continue;
60-
} else if (!value) {
61-
continue;
62-
}
63-
if (key === 'workdir' && value === '.') {
64-
continue;
65-
}
66-
res[key] = value;
67-
}
68-
return res;
69-
}
70-
7149
export async function getArgs(inputs: Inputs, definition: BakeDefinition, toolkit: Toolkit): Promise<Array<string>> {
7250
// prettier-ignore
7351
return [

‎src/main.ts‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ actionsToolkit.run(
2626
const startedTime = new Date();
2727

2828
const inputs: context.Inputs = await context.getInputs();
29+
stateHelper.setSummaryInputs(inputs);
2930
core.debug(`inputs: ${JSON.stringify(inputs)}`);
30-
stateHelper.setInputs(inputs);
3131

3232
const toolkit = new Toolkit();
3333
const gitAuthToken = process.env.BUILDX_BAKE_GIT_AUTH_TOKEN ?? inputs['github-token'];
@@ -88,6 +88,8 @@ actionsToolkit.run(
8888
let builder: BuilderInfo;
8989
await core.group(`Builder info`, async () => {
9090
builder = await toolkit.builder.inspect(inputs.builder);
91+
stateHelper.setBuilderDriver(builder.driver ?? '');
92+
stateHelper.setBuilderEndpoint(builder.nodes?.[0]?.endpoint ?? '');
9193
core.info(JSON.stringify(builder, null, 2));
9294
});
9395

@@ -193,8 +195,6 @@ actionsToolkit.run(
193195
core.info('Build summary is not yet supported on GHES');
194196
} else if (!(await toolkit.buildx.versionSatisfies('>=0.13.0'))) {
195197
core.info('Build summary requires Buildx >= 0.13.0');
196-
} else if (builder && builder.driver === 'cloud') {
197-
core.info('Build summary is not yet supported with Docker Build Cloud');
198198
} else if (refs.length == 0) {
199199
core.info('Build summary requires at least one build reference');
200200
} else {
@@ -237,8 +237,10 @@ actionsToolkit.run(
237237
await GitHub.writeBuildSummary({
238238
exportRes: exportRes,
239239
uploadRes: uploadRes,
240-
inputs: stateHelper.inputs,
241-
bakeDefinition: stateHelper.bakeDefinition
240+
inputs: stateHelper.summaryInputs,
241+
bakeDefinition: stateHelper.bakeDefinition,
242+
driver: stateHelper.builderDriver,
243+
endpoint: stateHelper.builderEndpoint
242244
});
243245
} catch (e) {
244246
core.warning(e.message);

‎src/state-helper.ts‎

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,28 @@ import * as core from '@actions/core';
22

33
import {BakeDefinition} from '@docker/actions-toolkit/lib/types/buildx/bake';
44

5-
import {Inputs, sanitizeInputs} from './context';
5+
import {Inputs} from './context';
66

77
export const tmpDir = process.env['STATE_tmpDir'] || '';
8-
export const inputs = process.env['STATE_inputs'] ? JSON.parse(process.env['STATE_inputs']) : undefined;
8+
9+
export const builderDriver = process.env['STATE_builderDriver'] || '';
10+
export const builderEndpoint = process.env['STATE_builderEndpoint'] || '';
11+
export const summaryInputs = process.env['STATE_summaryInputs'] ? JSON.parse(process.env['STATE_summaryInputs']) : undefined;
912
export const bakeDefinition = process.env['STATE_bakeDefinition'] ? <BakeDefinition>JSON.parse(process.env['STATE_bakeDefinition']) : undefined;
13+
1014
export const buildRefs = process.env['STATE_buildRefs'] ? process.env['STATE_buildRefs'].split(',') : [];
1115
export const isSummarySupported = !!process.env['STATE_isSummarySupported'];
1216

1317
export function setTmpDir(tmpDir: string) {
1418
core.saveState('tmpDir', tmpDir);
1519
}
1620

17-
export function setInputs(inputs: Inputs) {
18-
core.saveState('inputs', JSON.stringify(sanitizeInputs(inputs)));
21+
export function setBuilderDriver(builderDriver: string) {
22+
core.saveState('builderDriver', builderDriver);
23+
}
24+
25+
export function setBuilderEndpoint(builderEndpoint: string) {
26+
core.saveState('builderEndpoint', builderEndpoint);
1927
}
2028

2129
export function setBakeDefinition(bakeDefinition: BakeDefinition) {
@@ -29,3 +37,22 @@ export function setBuildRefs(buildRefs: Array<string>) {
2937
export function setSummarySupported() {
3038
core.saveState('isSummarySupported', 'true');
3139
}
40+
41+
export function setSummaryInputs(inputs: Inputs) {
42+
const res = {};
43+
for (const key of Object.keys(inputs)) {
44+
if (key === 'github-token') {
45+
continue;
46+
}
47+
const value: string | string[] | boolean = inputs[key];
48+
if (typeof value === 'boolean' && !value) {
49+
continue;
50+
} else if (Array.isArray(value) && value.length === 0) {
51+
continue;
52+
} else if (!value) {
53+
continue;
54+
}
55+
res[key] = value;
56+
}
57+
core.saveState('summaryInputs', JSON.stringify(res));
58+
}

‎yarn.lock‎

Lines changed: 85 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,18 @@ __metadata:
9191
languageName: node
9292
linkType: hard
9393

94-
"@actions/github@npm:^6.0.0":
95-
version: 6.0.0
96-
resolution: "@actions/github@npm:6.0.0"
94+
"@actions/github@npm:^6.0.1":
95+
version: 6.0.1
96+
resolution: "@actions/github@npm:6.0.1"
9797
dependencies:
9898
"@actions/http-client": ^2.2.0
9999
"@octokit/core": ^5.0.1
100-
"@octokit/plugin-paginate-rest": ^9.0.0
101-
"@octokit/plugin-rest-endpoint-methods": ^10.0.0
102-
checksum: 81831a78377175d8825fc0b94247ff366c0e87ad1dfa48df9b30b8659506f216dcf1e2d3124fcd318839b92c24ba20165e238b3cc11a34db89c69c40825e9ccf
100+
"@octokit/plugin-paginate-rest": ^9.2.2
101+
"@octokit/plugin-rest-endpoint-methods": ^10.4.0
102+
"@octokit/request": ^8.4.1
103+
"@octokit/request-error": ^5.1.1
104+
undici: ^5.28.5
105+
checksum: ba6a162a5727dea2f3f3fc450e02c5b336ceb65a0e26ba9ad9c62b20f4f5b2625ca347a9311a4905ef3c92378ca022caba841a283cb7f2e4175d79e3d1ecaf12
103106
languageName: node
104107
linkType: hard
105108

@@ -1065,15 +1068,15 @@ __metadata:
10651068
languageName: node
10661069
linkType: hard
10671070

1068-
"@docker/actions-toolkit@npm:^0.61.0":
1069-
version: 0.61.0
1070-
resolution: "@docker/actions-toolkit@npm:0.61.0"
1071+
"@docker/actions-toolkit@npm:^0.62.1":
1072+
version: 0.62.1
1073+
resolution: "@docker/actions-toolkit@npm:0.62.1"
10711074
dependencies:
10721075
"@actions/artifact": ^2.3.2
10731076
"@actions/cache": ^4.0.3
10741077
"@actions/core": ^1.11.1
10751078
"@actions/exec": ^1.1.1
1076-
"@actions/github": ^6.0.0
1079+
"@actions/github": ^6.0.1
10771080
"@actions/http-client": ^2.2.3
10781081
"@actions/io": ^1.1.3
10791082
"@actions/tool-cache": ^2.0.2
@@ -1087,10 +1090,10 @@ __metadata:
10871090
he: ^1.2.0
10881091
js-yaml: ^4.1.0
10891092
jwt-decode: ^4.0.0
1090-
semver: ^7.7.1
1093+
semver: ^7.7.2
10911094
tar-stream: ^3.1.7
10921095
tmp: ^0.2.3
1093-
checksum: 60cc6c8f5bde8221a3d6a40c15258d44a468950353098f1814d8af3a14131df9c41df5b87298cd82f5c77aa4e36e262c15a5bb0cc03ea2857bea18c9e0952d80
1096+
checksum: 72dfef5073c7b638a73b53ccd48ec9dc3fa0e0c1b1b0aaf711fc872ef4ef0a882909271c01913f335efc5f868e4062e6e7720b92d6c3a605ecb6cc30d3001f9d
10941097
languageName: node
10951098
linkType: hard
10961099

@@ -1689,6 +1692,16 @@ __metadata:
16891692
languageName: node
16901693
linkType: hard
16911694

1695+
"@octokit/endpoint@npm:^9.0.6":
1696+
version: 9.0.6
1697+
resolution: "@octokit/endpoint@npm:9.0.6"
1698+
dependencies:
1699+
"@octokit/types": ^13.1.0
1700+
universal-user-agent: ^6.0.0
1701+
checksum: f853c08f0777a8cc7c3d2509835d478e11a76d722f807d4f2ad7c0e64bf4dd159536409f466b367a907886aa3b78574d3d09ed95ac462c769e4fccaaad81e72a
1702+
languageName: node
1703+
linkType: hard
1704+
16921705
"@octokit/graphql@npm:^4.5.8":
16931706
version: 4.8.0
16941707
resolution: "@octokit/graphql@npm:4.8.0"
@@ -1732,6 +1745,13 @@ __metadata:
17321745
languageName: node
17331746
linkType: hard
17341747

1748+
"@octokit/openapi-types@npm:^24.2.0":
1749+
version: 24.2.0
1750+
resolution: "@octokit/openapi-types@npm:24.2.0"
1751+
checksum: 3c2d2f4cafd21c8a1e6a6fe6b56df6a3c09bc52ab6f829c151f9397694d028aa183ae856f08e006ee7ecaa7bd7eb413a903fbc0ffa6403e7b284ddcda20b1294
1752+
languageName: node
1753+
linkType: hard
1754+
17351755
"@octokit/plugin-paginate-rest@npm:^2.17.0":
17361756
version: 2.21.3
17371757
resolution: "@octokit/plugin-paginate-rest@npm:2.21.3"
@@ -1743,14 +1763,14 @@ __metadata:
17431763
languageName: node
17441764
linkType: hard
17451765

1746-
"@octokit/plugin-paginate-rest@npm:^9.0.0":
1747-
version: 9.0.0
1748-
resolution: "@octokit/plugin-paginate-rest@npm:9.0.0"
1766+
"@octokit/plugin-paginate-rest@npm:^9.2.2":
1767+
version: 9.2.2
1768+
resolution: "@octokit/plugin-paginate-rest@npm:9.2.2"
17491769
dependencies:
1750-
"@octokit/types": ^12.0.0
1770+
"@octokit/types": ^12.6.0
17511771
peerDependencies:
1752-
"@octokit/core": ">=5"
1753-
checksum: 4a8543f3e45c4916f94edc57d66106ee60da9fd4edccd7c3a2ddd00da1fc4eb2e1b2bcb3d6cb981a050edf883100c5004d0b81497568d4ac9138310a2188a458
1772+
"@octokit/core": 5
1773+
checksum: ea2a3ebf6abc128a1996c5ff7148ebe755ee2ed001aa0c1d3088d67a9d78b093d84820e3ec73bfb165ca8774943a1158afdae4cf7b90b0a07f12ebbe1d8a428b
17541774
languageName: node
17551775
linkType: hard
17561776

@@ -1763,7 +1783,7 @@ __metadata:
17631783
languageName: node
17641784
linkType: hard
17651785

1766-
"@octokit/plugin-rest-endpoint-methods@npm:^10.0.0, @octokit/plugin-rest-endpoint-methods@npm:^10.4.0":
1786+
"@octokit/plugin-rest-endpoint-methods@npm:^10.4.0":
17671787
version: 10.4.0
17681788
resolution: "@octokit/plugin-rest-endpoint-methods@npm:10.4.0"
17691789
dependencies:
@@ -1818,6 +1838,17 @@ __metadata:
18181838
languageName: node
18191839
linkType: hard
18201840

1841+
"@octokit/request-error@npm:^5.1.1":
1842+
version: 5.1.1
1843+
resolution: "@octokit/request-error@npm:5.1.1"
1844+
dependencies:
1845+
"@octokit/types": ^13.1.0
1846+
deprecation: ^2.0.0
1847+
once: ^1.4.0
1848+
checksum: 17d0b3f59c2a8a285715bfe6a85168d9c417aa7a0ff553b9be4198a3bc8bb00384a3530221a448eb19f8f07ea9fc48d264869624f5f84fa63a948a7af8cddc8c
1849+
languageName: node
1850+
linkType: hard
1851+
18211852
"@octokit/request@npm:^5.6.0, @octokit/request@npm:^5.6.3":
18221853
version: 5.6.3
18231854
resolution: "@octokit/request@npm:5.6.3"
@@ -1845,6 +1876,18 @@ __metadata:
18451876
languageName: node
18461877
linkType: hard
18471878

1879+
"@octokit/request@npm:^8.4.1":
1880+
version: 8.4.1
1881+
resolution: "@octokit/request@npm:8.4.1"
1882+
dependencies:
1883+
"@octokit/endpoint": ^9.0.6
1884+
"@octokit/request-error": ^5.1.1
1885+
"@octokit/types": ^13.1.0
1886+
universal-user-agent: ^6.0.0
1887+
checksum: 0ba76728583543baeef9fda98690bc86c57e0a3ccac8c189d2b7d144d248c89167eb37a071ed8fead8f4da0a1c55c4dd98a8fc598769c263b95179fb200959de
1888+
languageName: node
1889+
linkType: hard
1890+
18481891
"@octokit/types@npm:^12.0.0":
18491892
version: 12.0.0
18501893
resolution: "@octokit/types@npm:12.0.0"
@@ -1863,6 +1906,15 @@ __metadata:
18631906
languageName: node
18641907
linkType: hard
18651908

1909+
"@octokit/types@npm:^13.1.0":
1910+
version: 13.10.0
1911+
resolution: "@octokit/types@npm:13.10.0"
1912+
dependencies:
1913+
"@octokit/openapi-types": ^24.2.0
1914+
checksum: fca3764548d5872535b9025c3b5fe6373fe588b287cb5b5259364796c1931bbe5e9ab8a86a5274ce43bb2b3e43b730067c3b86b6b1ade12a98cd59b2e8b3610d
1915+
languageName: node
1916+
linkType: hard
1917+
18661918
"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.39.0, @octokit/types@npm:^6.40.0":
18671919
version: 6.41.0
18681920
resolution: "@octokit/types@npm:6.41.0"
@@ -3141,7 +3193,7 @@ __metadata:
31413193
resolution: "docker-buildx-bake@workspace:."
31423194
dependencies:
31433195
"@actions/core": ^1.11.1
3144-
"@docker/actions-toolkit": ^0.61.0
3196+
"@docker/actions-toolkit": ^0.62.1
31453197
"@types/node": ^20.12.12
31463198
"@typescript-eslint/eslint-plugin": ^7.9.0
31473199
"@typescript-eslint/parser": ^7.9.0
@@ -5801,12 +5853,12 @@ __metadata:
58015853
languageName: node
58025854
linkType: hard
58035855

5804-
"semver@npm:^7.7.1":
5805-
version: 7.7.1
5806-
resolution: "semver@npm:7.7.1"
5856+
"semver@npm:^7.7.2":
5857+
version: 7.7.2
5858+
resolution: "semver@npm:7.7.2"
58075859
bin:
58085860
semver: bin/semver.js
5809-
checksum: 586b825d36874007c9382d9e1ad8f93888d8670040add24a28e06a910aeebd673a2eb9e3bf169c6679d9245e66efb9057e0852e70d9daa6c27372aab1dda7104
5861+
checksum: dd94ba8f1cbc903d8eeb4dd8bf19f46b3deb14262b6717d0de3c804b594058ae785ef2e4b46c5c3b58733c99c83339068203002f9e37cfe44f7e2cc5e3d2f621
58105862
languageName: node
58115863
linkType: hard
58125864

@@ -6405,6 +6457,15 @@ __metadata:
64056457
languageName: node
64066458
linkType: hard
64076459

6460+
"undici@npm:^5.28.5":
6461+
version: 5.29.0
6462+
resolution: "undici@npm:5.29.0"
6463+
dependencies:
6464+
"@fastify/busboy": ^2.0.0
6465+
checksum: a25b5462c1b6ffb974f5ffc492ffd64146a9983aad0cbda6fde65e2b22f6f1acd43f09beacc66cc47624a113bd0c684ffc60366102b6a21b038fbfafb7d75195
6466+
languageName: node
6467+
linkType: hard
6468+
64086469
"unique-filename@npm:^3.0.0":
64096470
version: 3.0.0
64106471
resolution: "unique-filename@npm:3.0.0"

0 commit comments

Comments
 (0)