Skip to content

Commit 2634353

Browse files
crazy-maxcrazy-max
authored
Merge pull request #1381 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 0788c44 + c0432d2 commit 2634353

File tree

6 files changed

+127
-48
lines changed

6 files changed

+127
-48
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": "[email protected]",
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.7"
3232
},
3333
"devDependencies": {

‎src/main.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ actionsToolkit.run(
8585
let builder: BuilderInfo;
8686
await core.group(`Builder info`, async () => {
8787
builder = await toolkit.builder.inspect(inputs.builder);
88+
stateHelper.setBuilderDriver(builder.driver ?? '');
89+
stateHelper.setBuilderEndpoint(builder.nodes?.[0]?.endpoint ?? '');
8890
core.info(JSON.stringify(builder, null, 2));
8991
});
9092

@@ -173,8 +175,6 @@ actionsToolkit.run(
173175
core.info('Build summary is not yet supported on GHES');
174176
} else if (!(await toolkit.buildx.versionSatisfies('>=0.13.0'))) {
175177
core.info('Build summary requires Buildx >= 0.13.0');
176-
} else if (builder && builder.driver === 'cloud') {
177-
core.info('Build summary is not yet supported with Docker Build Cloud');
178178
} else if (!ref) {
179179
core.info('Build summary requires a build reference');
180180
} else {
@@ -217,7 +217,9 @@ actionsToolkit.run(
217217
await GitHub.writeBuildSummary({
218218
exportRes: exportRes,
219219
uploadRes: uploadRes,
220-
inputs: stateHelper.summaryInputs
220+
inputs: stateHelper.summaryInputs,
221+
driver: stateHelper.builderDriver,
222+
endpoint: stateHelper.builderEndpoint
221223
});
222224
} catch (e) {
223225
core.warning(e.message);

‎src/state-helper.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,26 @@ import {Build} from '@docker/actions-toolkit/lib/buildx/build';
55
import {Inputs} from './context';
66

77
export const tmpDir = process.env['STATE_tmpDir'] || '';
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;
12+
813
export const buildRef = process.env['STATE_buildRef'] || '';
914
export const isSummarySupported = !!process.env['STATE_isSummarySupported'];
10-
export const summaryInputs = process.env['STATE_summaryInputs'] ? JSON.parse(process.env['STATE_summaryInputs']) : undefined;
1115

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

20+
export function setBuilderDriver(builderDriver: string) {
21+
core.saveState('builderDriver', builderDriver);
22+
}
23+
24+
export function setBuilderEndpoint(builderEndpoint: string) {
25+
core.saveState('builderEndpoint', builderEndpoint);
26+
}
27+
1628
export function setBuildRef(buildRef: string) {
1729
core.saveState('buildRef', buildRef);
1830
}

‎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

@@ -1072,15 +1075,15 @@ __metadata:
10721075
languageName: node
10731076
linkType: hard
10741077

1075-
"@docker/actions-toolkit@npm:0.61.0":
1076-
version: 0.61.0
1077-
resolution: "@docker/actions-toolkit@npm:0.61.0"
1078+
"@docker/actions-toolkit@npm:0.62.1":
1079+
version: 0.62.1
1080+
resolution: "@docker/actions-toolkit@npm:0.62.1"
10781081
dependencies:
10791082
"@actions/artifact": ^2.3.2
10801083
"@actions/cache": ^4.0.3
10811084
"@actions/core": ^1.11.1
10821085
"@actions/exec": ^1.1.1
1083-
"@actions/github": ^6.0.0
1086+
"@actions/github": ^6.0.1
10841087
"@actions/http-client": ^2.2.3
10851088
"@actions/io": ^1.1.3
10861089
"@actions/tool-cache": ^2.0.2
@@ -1094,10 +1097,10 @@ __metadata:
10941097
he: ^1.2.0
10951098
js-yaml: ^4.1.0
10961099
jwt-decode: ^4.0.0
1097-
semver: ^7.7.1
1100+
semver: ^7.7.2
10981101
tar-stream: ^3.1.7
10991102
tmp: ^0.2.3
1100-
checksum: 60cc6c8f5bde8221a3d6a40c15258d44a468950353098f1814d8af3a14131df9c41df5b87298cd82f5c77aa4e36e262c15a5bb0cc03ea2857bea18c9e0952d80
1103+
checksum: 72dfef5073c7b638a73b53ccd48ec9dc3fa0e0c1b1b0aaf711fc872ef4ef0a882909271c01913f335efc5f868e4062e6e7720b92d6c3a605ecb6cc30d3001f9d
11011104
languageName: node
11021105
linkType: hard
11031106

@@ -1686,6 +1689,16 @@ __metadata:
16861689
languageName: node
16871690
linkType: hard
16881691

1692+
"@octokit/endpoint@npm:^9.0.6":
1693+
version: 9.0.6
1694+
resolution: "@octokit/endpoint@npm:9.0.6"
1695+
dependencies:
1696+
"@octokit/types": ^13.1.0
1697+
universal-user-agent: ^6.0.0
1698+
checksum: f853c08f0777a8cc7c3d2509835d478e11a76d722f807d4f2ad7c0e64bf4dd159536409f466b367a907886aa3b78574d3d09ed95ac462c769e4fccaaad81e72a
1699+
languageName: node
1700+
linkType: hard
1701+
16891702
"@octokit/graphql@npm:^4.5.8":
16901703
version: 4.8.0
16911704
resolution: "@octokit/graphql@npm:4.8.0"
@@ -1729,6 +1742,13 @@ __metadata:
17291742
languageName: node
17301743
linkType: hard
17311744

1745+
"@octokit/openapi-types@npm:^24.2.0":
1746+
version: 24.2.0
1747+
resolution: "@octokit/openapi-types@npm:24.2.0"
1748+
checksum: 3c2d2f4cafd21c8a1e6a6fe6b56df6a3c09bc52ab6f829c151f9397694d028aa183ae856f08e006ee7ecaa7bd7eb413a903fbc0ffa6403e7b284ddcda20b1294
1749+
languageName: node
1750+
linkType: hard
1751+
17321752
"@octokit/plugin-paginate-rest@npm:^2.17.0":
17331753
version: 2.21.3
17341754
resolution: "@octokit/plugin-paginate-rest@npm:2.21.3"
@@ -1740,14 +1760,14 @@ __metadata:
17401760
languageName: node
17411761
linkType: hard
17421762

1743-
"@octokit/plugin-paginate-rest@npm:^9.0.0":
1744-
version: 9.0.0
1745-
resolution: "@octokit/plugin-paginate-rest@npm:9.0.0"
1763+
"@octokit/plugin-paginate-rest@npm:^9.2.2":
1764+
version: 9.2.2
1765+
resolution: "@octokit/plugin-paginate-rest@npm:9.2.2"
17461766
dependencies:
1747-
"@octokit/types": ^12.0.0
1767+
"@octokit/types": ^12.6.0
17481768
peerDependencies:
1749-
"@octokit/core": ">=5"
1750-
checksum: 4a8543f3e45c4916f94edc57d66106ee60da9fd4edccd7c3a2ddd00da1fc4eb2e1b2bcb3d6cb981a050edf883100c5004d0b81497568d4ac9138310a2188a458
1769+
"@octokit/core": 5
1770+
checksum: ea2a3ebf6abc128a1996c5ff7148ebe755ee2ed001aa0c1d3088d67a9d78b093d84820e3ec73bfb165ca8774943a1158afdae4cf7b90b0a07f12ebbe1d8a428b
17511771
languageName: node
17521772
linkType: hard
17531773

@@ -1760,7 +1780,7 @@ __metadata:
17601780
languageName: node
17611781
linkType: hard
17621782

1763-
"@octokit/plugin-rest-endpoint-methods@npm:^10.0.0, @octokit/plugin-rest-endpoint-methods@npm:^10.4.0":
1783+
"@octokit/plugin-rest-endpoint-methods@npm:^10.4.0":
17641784
version: 10.4.0
17651785
resolution: "@octokit/plugin-rest-endpoint-methods@npm:10.4.0"
17661786
dependencies:
@@ -1815,6 +1835,17 @@ __metadata:
18151835
languageName: node
18161836
linkType: hard
18171837

1838+
"@octokit/request-error@npm:^5.1.1":
1839+
version: 5.1.1
1840+
resolution: "@octokit/request-error@npm:5.1.1"
1841+
dependencies:
1842+
"@octokit/types": ^13.1.0
1843+
deprecation: ^2.0.0
1844+
once: ^1.4.0
1845+
checksum: 17d0b3f59c2a8a285715bfe6a85168d9c417aa7a0ff553b9be4198a3bc8bb00384a3530221a448eb19f8f07ea9fc48d264869624f5f84fa63a948a7af8cddc8c
1846+
languageName: node
1847+
linkType: hard
1848+
18181849
"@octokit/request@npm:^5.6.0, @octokit/request@npm:^5.6.3":
18191850
version: 5.6.3
18201851
resolution: "@octokit/request@npm:5.6.3"
@@ -1842,6 +1873,18 @@ __metadata:
18421873
languageName: node
18431874
linkType: hard
18441875

1876+
"@octokit/request@npm:^8.4.1":
1877+
version: 8.4.1
1878+
resolution: "@octokit/request@npm:8.4.1"
1879+
dependencies:
1880+
"@octokit/endpoint": ^9.0.6
1881+
"@octokit/request-error": ^5.1.1
1882+
"@octokit/types": ^13.1.0
1883+
universal-user-agent: ^6.0.0
1884+
checksum: 0ba76728583543baeef9fda98690bc86c57e0a3ccac8c189d2b7d144d248c89167eb37a071ed8fead8f4da0a1c55c4dd98a8fc598769c263b95179fb200959de
1885+
languageName: node
1886+
linkType: hard
1887+
18451888
"@octokit/types@npm:^12.0.0":
18461889
version: 12.0.0
18471890
resolution: "@octokit/types@npm:12.0.0"
@@ -1860,6 +1903,15 @@ __metadata:
18601903
languageName: node
18611904
linkType: hard
18621905

1906+
"@octokit/types@npm:^13.1.0":
1907+
version: 13.10.0
1908+
resolution: "@octokit/types@npm:13.10.0"
1909+
dependencies:
1910+
"@octokit/openapi-types": ^24.2.0
1911+
checksum: fca3764548d5872535b9025c3b5fe6373fe588b287cb5b5259364796c1931bbe5e9ab8a86a5274ce43bb2b3e43b730067c3b86b6b1ade12a98cd59b2e8b3610d
1912+
languageName: node
1913+
linkType: hard
1914+
18631915
"@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.39.0, @octokit/types@npm:^6.40.0":
18641916
version: 6.41.0
18651917
resolution: "@octokit/types@npm:6.41.0"
@@ -3143,7 +3195,7 @@ __metadata:
31433195
resolution: "docker-build-push@workspace:."
31443196
dependencies:
31453197
"@actions/core": ^1.11.1
3146-
"@docker/actions-toolkit": 0.61.0
3198+
"@docker/actions-toolkit": 0.62.1
31473199
"@types/node": ^20.12.12
31483200
"@typescript-eslint/eslint-plugin": ^7.9.0
31493201
"@typescript-eslint/parser": ^7.9.0
@@ -5825,12 +5877,12 @@ __metadata:
58255877
languageName: node
58265878
linkType: hard
58275879

5828-
"semver@npm:^7.7.1":
5829-
version: 7.7.1
5830-
resolution: "semver@npm:7.7.1"
5880+
"semver@npm:^7.7.2":
5881+
version: 7.7.2
5882+
resolution: "semver@npm:7.7.2"
58315883
bin:
58325884
semver: bin/semver.js
5833-
checksum: 586b825d36874007c9382d9e1ad8f93888d8670040add24a28e06a910aeebd673a2eb9e3bf169c6679d9245e66efb9057e0852e70d9daa6c27372aab1dda7104
5885+
checksum: dd94ba8f1cbc903d8eeb4dd8bf19f46b3deb14262b6717d0de3c804b594058ae785ef2e4b46c5c3b58733c99c83339068203002f9e37cfe44f7e2cc5e3d2f621
58345886
languageName: node
58355887
linkType: hard
58365888

@@ -6436,6 +6488,15 @@ __metadata:
64366488
languageName: node
64376489
linkType: hard
64386490

6491+
"undici@npm:^5.28.5":
6492+
version: 5.29.0
6493+
resolution: "undici@npm:5.29.0"
6494+
dependencies:
6495+
"@fastify/busboy": ^2.0.0
6496+
checksum: a25b5462c1b6ffb974f5ffc492ffd64146a9983aad0cbda6fde65e2b22f6f1acd43f09beacc66cc47624a113bd0c684ffc60366102b6a21b038fbfafb7d75195
6497+
languageName: node
6498+
linkType: hard
6499+
64396500
"unique-filename@npm:^3.0.0":
64406501
version: 3.0.0
64416502
resolution: "unique-filename@npm:3.0.0"

0 commit comments

Comments
 (0)