From 755c685d84ef7c2083dcabfec2680d199f3ed397 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 22:35:37 +0000 Subject: [PATCH 01/13] build(deps): bump tmp from 0.2.2 to 0.2.3 Bumps [tmp](https://github.com/raszi/node-tmp) from 0.2.2 to 0.2.3. - [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md) - [Commits](https://github.com/raszi/node-tmp/compare/v0.2.2...v0.2.3) --- updated-dependencies: - dependency-name: tmp dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 51 +++++---------------------------------------------- 2 files changed, 6 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 09700379..fa54b28b 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "handlebars": "^4.7.8", "jwt-decode": "^4.0.0", "semver": "^7.5.4", - "tmp": "^0.2.2" + "tmp": "^0.2.3" }, "devDependencies": { "@types/csv-parse": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index 08635350..968e793f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1069,7 +1069,7 @@ __metadata: prettier: ^3.0.3 rimraf: ^5.0.1 semver: ^7.5.4 - tmp: ^0.2.2 + tmp: ^0.2.3 ts-jest: ^29.1.1 ts-node: ^10.9.1 typescript: ^5.2.2 @@ -4101,21 +4101,6 @@ __metadata: languageName: node linkType: hard -"glob@npm:^10.3.7": - version: 10.3.10 - resolution: "glob@npm:10.3.10" - dependencies: - foreground-child: ^3.1.0 - jackspeak: ^2.3.5 - minimatch: ^9.0.1 - minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 - path-scurry: ^1.10.1 - bin: - glob: dist/esm/bin.mjs - checksum: 4f2fe2511e157b5a3f525a54092169a5f92405f24d2aed3142f4411df328baca13059f4182f1db1bf933e2c69c0bd89e57ae87edd8950cba8c7ccbe84f721cf3 - languageName: node - linkType: hard - "glob@npm:^7.1.3, glob@npm:^7.1.4": version: 7.1.7 resolution: "glob@npm:7.1.7" @@ -4851,19 +4836,6 @@ __metadata: languageName: node linkType: hard -"jackspeak@npm:^2.3.5": - version: 2.3.6 - resolution: "jackspeak@npm:2.3.6" - dependencies: - "@isaacs/cliui": ^8.0.2 - "@pkgjs/parseargs": ^0.11.0 - dependenciesMeta: - "@pkgjs/parseargs": - optional: true - checksum: 57d43ad11eadc98cdfe7496612f6bbb5255ea69fe51ea431162db302c2a11011642f50cfad57288bd0aea78384a0612b16e131944ad8ecd09d619041c8531b54 - languageName: node - linkType: hard - "jest-changed-files@npm:^29.6.3": version: 29.6.3 resolution: "jest-changed-files@npm:29.6.3" @@ -6422,17 +6394,6 @@ __metadata: languageName: node linkType: hard -"rimraf@npm:^5.0.5": - version: 5.0.5 - resolution: "rimraf@npm:5.0.5" - dependencies: - glob: ^10.3.7 - bin: - rimraf: dist/esm/bin.mjs - checksum: d66eef829b2e23b16445f34e73d75c7b7cf4cbc8834b04720def1c8f298eb0753c3d76df77325fad79d0a2c60470525d95f89c2475283ad985fd7441c32732d1 - languageName: node - linkType: hard - "run-applescript@npm:^5.0.0": version: 5.0.0 resolution: "run-applescript@npm:5.0.0" @@ -6900,12 +6861,10 @@ __metadata: languageName: node linkType: hard -"tmp@npm:^0.2.2": - version: 0.2.2 - resolution: "tmp@npm:0.2.2" - dependencies: - rimraf: ^5.0.5 - checksum: 7d00f417c21a4478611c8d2e0a939b7f242929f13b8f5d2edfc627afe5877720692fb45563ce3c81de54a009f2205f6b1ad02314b6e683aebf2e40b9b9430132 +"tmp@npm:^0.2.3": + version: 0.2.3 + resolution: "tmp@npm:0.2.3" + checksum: 73b5c96b6e52da7e104d9d44afb5d106bb1e16d9fa7d00dbeb9e6522e61b571fbdb165c756c62164be9a3bbe192b9b268c236d370a2a0955c7689cd2ae377b95 languageName: node linkType: hard From 224d7ab315e8b6f6d35b6987bbac8b9141067d39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 22:57:05 +0000 Subject: [PATCH 02/13] build(deps): bump @actions/http-client from 2.2.0 to 2.2.1 Bumps [@actions/http-client](https://github.com/actions/toolkit/tree/HEAD/packages/http-client) from 2.2.0 to 2.2.1. - [Changelog](https://github.com/actions/toolkit/blob/main/packages/http-client/RELEASES.md) - [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/http-client) --- updated-dependencies: - dependency-name: "@actions/http-client" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 09700379..a36eb125 100644 --- a/package.json +++ b/package.json @@ -49,7 +49,7 @@ "@actions/core": "^1.10.1", "@actions/exec": "^1.1.1", "@actions/github": "^6.0.0", - "@actions/http-client": "^2.2.0", + "@actions/http-client": "^2.2.1", "@actions/io": "^1.1.3", "@actions/tool-cache": "^2.0.1", "@octokit/core": "^5.1.0", diff --git a/yarn.lock b/yarn.lock index 08635350..f31ba4eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -109,6 +109,16 @@ __metadata: languageName: node linkType: hard +"@actions/http-client@npm:^2.2.1": + version: 2.2.1 + resolution: "@actions/http-client@npm:2.2.1" + dependencies: + tunnel: ^0.0.6 + undici: ^5.25.4 + checksum: c51c003cd697289136c0e81c0f9b8e57a9bb1a038dc7c9a91a71c02f4ae5e27ef7d3e305aefa7c815604049209d114c06e9991a5c5eaa055508519329267f962 + languageName: node + linkType: hard + "@actions/io@npm:^1.0.1, @actions/io@npm:^1.1.1, @actions/io@npm:^1.1.3": version: 1.1.3 resolution: "@actions/io@npm:1.1.3" @@ -1043,7 +1053,7 @@ __metadata: "@actions/core": ^1.10.1 "@actions/exec": ^1.1.1 "@actions/github": ^6.0.0 - "@actions/http-client": ^2.2.0 + "@actions/http-client": ^2.2.1 "@actions/io": ^1.1.3 "@actions/tool-cache": ^2.0.1 "@octokit/core": ^5.1.0 From 8e9a04559ba47be8f248a0aeb27eecebe1e5ce32 Mon Sep 17 00:00:00 2001 From: crazy-max <1951866+crazy-max@users.noreply.github.com> Date: Wed, 6 Mar 2024 00:15:45 +0000 Subject: [PATCH 03/13] github: update .github/buildx-releases.json Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/buildx-releases.json | 115 ++++++++++++++++++++++++----------- 1 file changed, 78 insertions(+), 37 deletions(-) diff --git a/.github/buildx-releases.json b/.github/buildx-releases.json index d809d1e8..84b34423 100644 --- a/.github/buildx-releases.json +++ b/.github/buildx-releases.json @@ -1,43 +1,84 @@ { "latest": { - "id": 136761257, - "tag_name": "v0.12.1", - "html_url": "https://github.com/docker/buildx/releases/tag/v0.12.1", + "id": 144928424, + "tag_name": "v0.13.0", + "html_url": "https://github.com/docker/buildx/releases/tag/v0.13.0", "assets": [ - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-amd64", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-amd64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-amd64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-arm64", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-arm64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.darwin-arm64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-amd64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v6.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm-v7.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-arm64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-ppc64le.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-riscv64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.linux-s390x.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.exe", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-amd64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-arm64.exe", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-arm64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/buildx-v0.12.1.windows-arm64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.12.1/checksums.txt" + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-amd64", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-arm64", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.exe", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/checksums.txt" + ] + }, + "v0.13.0": { + "id": 144928424, + "tag_name": "v0.13.0", + "html_url": "https://github.com/docker/buildx/releases/tag/v0.13.0", + "assets": [ + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-amd64", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-arm64", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.exe", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.0/checksums.txt" ] }, "v0.13.0-rc2": { From 63adf444663af10b2d82236e932c1c14043b1ace Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Wed, 6 Mar 2024 14:50:17 +0100 Subject: [PATCH 04/13] test: keep quotes around fields Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- __tests__/util.test.ts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/__tests__/util.test.ts b/__tests__/util.test.ts index d183896f..84504187 100644 --- a/__tests__/util.test.ts +++ b/__tests__/util.test.ts @@ -191,6 +191,12 @@ ccccccccc`, 'FOO=bar' ]); }); + + it('keep quotes', async () => { + const output = `type=image,"name=ghcr.io/nginxinc/nginx-unprivileged,docker.io/nginxinc/nginx-unprivileged",push-by-digest=true,name-canonical=true,push=true`; + setInput('outputs', output); + expect(Util.getInputList('outputs', {ignoreComma: true, quote: false})).toEqual([output]); + }); }); describe('asyncForEach', () => { From e6c7da2fcd5bb8223fda281bf64fd8131a7d93d0 Mon Sep 17 00:00:00 2001 From: crazy-max <1951866+crazy-max@users.noreply.github.com> Date: Thu, 7 Mar 2024 12:08:13 +0000 Subject: [PATCH 05/13] github: update .github/docker-releases.json Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/docker-releases.json | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/docker-releases.json b/.github/docker-releases.json index bcdf8117..9e685d52 100644 --- a/.github/docker-releases.json +++ b/.github/docker-releases.json @@ -1,8 +1,14 @@ { "latest": { - "id": 140187402, - "tag_name": "v25.0.3", - "html_url": "https://github.com/moby/moby/releases/tag/v25.0.3", + "id": 144022554, + "tag_name": "v25.0.4", + "html_url": "https://github.com/moby/moby/releases/tag/v25.0.4", + "assets": [] + }, + "v25.0.4": { + "id": 144022554, + "tag_name": "v25.0.4", + "html_url": "https://github.com/moby/moby/releases/tag/v25.0.4", "assets": [] }, "v26.0.0-rc1": { From 26887092dc2e43453cf5755e3fd83c8637d41351 Mon Sep 17 00:00:00 2001 From: crazy-max <1951866+crazy-max@users.noreply.github.com> Date: Fri, 8 Mar 2024 00:21:27 +0000 Subject: [PATCH 06/13] github: update .github/docker-releases.json Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/docker-releases.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/docker-releases.json b/.github/docker-releases.json index 9e685d52..a3e69bf6 100644 --- a/.github/docker-releases.json +++ b/.github/docker-releases.json @@ -5,6 +5,12 @@ "html_url": "https://github.com/moby/moby/releases/tag/v25.0.4", "assets": [] }, + "v26.0.0-rc2": { + "id": 144926580, + "tag_name": "v26.0.0-rc2", + "html_url": "https://github.com/moby/moby/releases/tag/v26.0.0-rc2", + "assets": [] + }, "v25.0.4": { "id": 144022554, "tag_name": "v25.0.4", From 225d61b701a9f228974b35d547375e753fc4f113 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Fri, 8 Mar 2024 11:40:09 +0100 Subject: [PATCH 07/13] builder: update inspect command parsing Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- __tests__/buildx/builder.test.ts | 60 +++++++++++++++++++++++++++++++- __tests__/fixtures/inspect11.txt | 34 ++++++++++++++++++ src/buildx/builder.ts | 32 +++++++---------- 3 files changed, 105 insertions(+), 21 deletions(-) create mode 100644 __tests__/fixtures/inspect11.txt diff --git a/__tests__/buildx/builder.test.ts b/__tests__/buildx/builder.test.ts index fab65b12..f6a77c0f 100644 --- a/__tests__/buildx/builder.test.ts +++ b/__tests__/buildx/builder.test.ts @@ -393,7 +393,65 @@ describe('parseInspect', () => { } ], } - ] + ], + [ + 'inspect11.txt', + { + "name": "builder", + "driver": "docker-container", + "lastActivity": new Date("2024-03-01T14:25:03.000Z"), + "nodes": [ + { + "buildkit": "37657a1", + "buildkitd-flags": "--debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host --allow-insecure-entitlement=network.host", + "driver-opts": [ + "env.JAEGER_TRACE=localhost:6831", + "image=moby/buildkit:master", + "network=host", + "env.BUILDKIT_STEP_LOG_MAX_SIZE=10485760", + "env.BUILDKIT_STEP_LOG_MAX_SPEED=10485760", + ], + "endpoint": "unix:///var/run/docker.sock", + "name": "builder0", + "platforms": "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6", + "status": "running", + "labels": { + "org.mobyproject.buildkit.worker.executor": "oci", + "org.mobyproject.buildkit.worker.hostname": "docker-desktop", + "org.mobyproject.buildkit.worker.network": "host", + "org.mobyproject.buildkit.worker.oci.process-mode": "sandbox", + "org.mobyproject.buildkit.worker.selinux.enabled": "false", + "org.mobyproject.buildkit.worker.snapshotter": "overlayfs", + }, + "gcPolicy": [ + { + "all": false, + "filter": [ + "type==source.local", + "type==exec.cachemount", + "type==source.git.checkout" + ], + "keepDuration": "48h0m0s", + "keepBytes": "488.3MiB", + }, + { + "all": false, + "keepDuration": "1440h0m0s", + "keepBytes": "94.06GiB", + }, + { + "all": false, + "keepBytes": "94.06GiB", + }, + { + "all": true, + "keepBytes": "94.06GiB", + } + ] + } + ] + } + ], ])('given %p', async (inspectFile, expected) => { expect(await Builder.parseInspect(fs.readFileSync(path.join(fixturesDir, inspectFile)).toString())).toEqual(expected); }); diff --git a/__tests__/fixtures/inspect11.txt b/__tests__/fixtures/inspect11.txt new file mode 100644 index 00000000..0c7f9c84 --- /dev/null +++ b/__tests__/fixtures/inspect11.txt @@ -0,0 +1,34 @@ +Name: builder +Driver: docker-container +Last Activity: 2024-03-01 14:25:03 +0000 UTC + +Nodes: +Name: builder0 +Endpoint: unix:///var/run/docker.sock +Driver Options: env.JAEGER_TRACE="localhost:6831" image="moby/buildkit:master" network="host" env.BUILDKIT_STEP_LOG_MAX_SIZE="10485760" env.BUILDKIT_STEP_LOG_MAX_SPEED="10485760" +Status: running +BuildKit daemon flags: --debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host --allow-insecure-entitlement=network.host +BuildKit version: 37657a1 +Platforms: linux/amd64, linux/amd64/v2, linux/amd64/v3, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/mips64le, linux/mips64, linux/arm/v7, linux/arm/v6 +Labels: + org.mobyproject.buildkit.worker.executor: oci + org.mobyproject.buildkit.worker.hostname: docker-desktop + org.mobyproject.buildkit.worker.network: host + org.mobyproject.buildkit.worker.oci.process-mode: sandbox + org.mobyproject.buildkit.worker.selinux.enabled: false + org.mobyproject.buildkit.worker.snapshotter: overlayfs +GC Policy rule#0: + All: false + Filters: type==source.local,type==exec.cachemount,type==source.git.checkout + Keep Duration: 48h0m0s + Keep Bytes: 488.3MiB +GC Policy rule#1: + All: false + Keep Duration: 1440h0m0s + Keep Bytes: 94.06GiB +GC Policy rule#2: + All: false + Keep Bytes: 94.06GiB +GC Policy rule#3: + All: true + Keep Bytes: 94.06GiB diff --git a/src/buildx/builder.ts b/src/buildx/builder.ts index 833d8190..58d396b2 100644 --- a/src/buildx/builder.ts +++ b/src/buildx/builder.ts @@ -83,7 +83,7 @@ export class Builder { continue; } switch (true) { - case lkey == 'name': { + case lkey == 'name': parsingType = undefined; if (builder.name == undefined) { builder.name = value; @@ -98,42 +98,36 @@ export class Builder { currentNode = {name: value}; } break; - } - case lkey == 'driver': { + case lkey == 'driver': parsingType = undefined; builder.driver = value; break; - } - case lkey == 'last activity': { + case lkey == 'last activity': parsingType = undefined; builder.lastActivity = new Date(value); break; - } - case lkey == 'endpoint': { + case lkey == 'endpoint': parsingType = undefined; currentNode.endpoint = value; break; - } - case lkey == 'driver options': { + case lkey == 'driver options': parsingType = undefined; currentNode['driver-opts'] = (value.match(/([a-zA-Z0-9_.]+)="([^"]*)"/g) || []).map(v => v.replace(/^(.*)="(.*)"$/g, '$1=$2')); break; - } - case lkey == 'status': { + case lkey == 'status': parsingType = undefined; currentNode.status = value; break; - } - case lkey == 'flags': { + case lkey == 'buildkit daemon flags': + case lkey == 'flags': // buildx < v0.13 parsingType = undefined; currentNode['buildkitd-flags'] = value; break; - } - case lkey == 'buildkit': { + case lkey == 'buildkit version': + case lkey == 'buildkit': // buildx < v0.13 parsingType = undefined; currentNode.buildkit = value; break; - } case lkey == 'platforms': { parsingType = undefined; if (!value) { @@ -155,19 +149,17 @@ export class Builder { currentNode.platforms = platforms.join(','); break; } - case lkey == 'labels': { + case lkey == 'labels': parsingType = 'label'; currentNode.labels = {}; break; - } - case lkey.startsWith('gc policy rule#'): { + case lkey.startsWith('gc policy rule#'): parsingType = 'gcpolicy'; if (currentNode.gcPolicy && currentGCPolicy) { currentNode.gcPolicy.push(currentGCPolicy); currentGCPolicy = undefined; } break; - } default: { switch (parsingType || '') { case 'label': { From 9436c6ca6175c0a6a1189ab60b0433063c1c5ffd Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Fri, 8 Mar 2024 11:49:58 +0100 Subject: [PATCH 08/13] builder: support features in inspect command Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- __tests__/buildx/builder.test.ts | 6 ++++++ __tests__/fixtures/inspect11.txt | 5 +++++ src/buildx/builder.ts | 9 +++++++++ src/types/builder.ts | 1 + 4 files changed, 21 insertions(+) diff --git a/__tests__/buildx/builder.test.ts b/__tests__/buildx/builder.test.ts index f6a77c0f..2606690c 100644 --- a/__tests__/buildx/builder.test.ts +++ b/__tests__/buildx/builder.test.ts @@ -415,6 +415,12 @@ describe('parseInspect', () => { "name": "builder0", "platforms": "linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6", "status": "running", + "features": { + "Cache export": true, + "Docker exporter": true, + "Multi-platform build": true, + "OCI exporter": true, + }, "labels": { "org.mobyproject.buildkit.worker.executor": "oci", "org.mobyproject.buildkit.worker.hostname": "docker-desktop", diff --git a/__tests__/fixtures/inspect11.txt b/__tests__/fixtures/inspect11.txt index 0c7f9c84..f70f6fae 100644 --- a/__tests__/fixtures/inspect11.txt +++ b/__tests__/fixtures/inspect11.txt @@ -10,6 +10,11 @@ Status: running BuildKit daemon flags: --debug --allow-insecure-entitlement security.insecure --allow-insecure-entitlement network.host --allow-insecure-entitlement=network.host BuildKit version: 37657a1 Platforms: linux/amd64, linux/amd64/v2, linux/amd64/v3, linux/arm64, linux/riscv64, linux/ppc64le, linux/s390x, linux/386, linux/mips64le, linux/mips64, linux/arm/v7, linux/arm/v6 +Features: + Cache export: true + Docker exporter: true + Multi-platform build: true + OCI exporter: true Labels: org.mobyproject.buildkit.worker.executor: oci org.mobyproject.buildkit.worker.hostname: docker-desktop diff --git a/src/buildx/builder.ts b/src/buildx/builder.ts index 58d396b2..66deb9a6 100644 --- a/src/buildx/builder.ts +++ b/src/buildx/builder.ts @@ -149,6 +149,10 @@ export class Builder { currentNode.platforms = platforms.join(','); break; } + case lkey == 'features': + parsingType = 'features'; + currentNode.features = {}; + break; case lkey == 'labels': parsingType = 'label'; currentNode.labels = {}; @@ -162,6 +166,11 @@ export class Builder { break; default: { switch (parsingType || '') { + case 'features': { + currentNode.features = currentNode.features || {}; + currentNode.features[key.trim()] = Boolean(value); + break; + } case 'label': { currentNode.labels = currentNode.labels || {}; currentNode.labels[key.trim()] = value; diff --git a/src/types/builder.ts b/src/types/builder.ts index 617f4342..52bf77e6 100644 --- a/src/types/builder.ts +++ b/src/types/builder.ts @@ -32,6 +32,7 @@ export interface Node { export interface NodeInfo extends Node { status?: string; buildkit?: string; + features?: Record; labels?: Record; gcPolicy?: Array; } From 70d3d9ae6759532b530ffe528575d44aab5067e2 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Fri, 8 Mar 2024 11:55:21 +0100 Subject: [PATCH 09/13] builder: enable debug for inspect cmd to display additional fields Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- src/buildx/builder.ts | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/buildx/builder.ts b/src/buildx/builder.ts index 66deb9a6..98a7082b 100644 --- a/src/buildx/builder.ts +++ b/src/buildx/builder.ts @@ -56,10 +56,19 @@ export class Builder { } public async inspect(name: string): Promise { + // always enable debug for inspect command, so we can display additional + // fields such as features: https://github.com/docker/buildx/pull/1854 + const envs = Object.assign({}, process.env, { + DEBUG: '1' + }) as { + [key: string]: string; + }; + const cmd = await this.buildx.getCommand(['inspect', name]); return await Exec.getExecOutput(cmd.command, cmd.args, { ignoreReturnCode: true, - silent: true + silent: true, + env: envs }).then(res => { if (res.stderr.length > 0 && res.exitCode != 0) { throw new Error(res.stderr.trim()); From 22e390c8bae1eab9f8b147c1a78e8871ed3ca132 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 22:31:07 +0000 Subject: [PATCH 10/13] build(deps): bump peter-evans/create-pull-request from 6.0.1 to 6.0.2 Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/a4f52f8033a6168103c2538976c07b467e8163bc...70a41aba780001da0a30141984ae2a0c95d8704e) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/buildx-lab-releases-json.yml | 2 +- .github/workflows/buildx-releases-json.yml | 2 +- .github/workflows/docker-releases-json.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildx-lab-releases-json.yml b/.github/workflows/buildx-lab-releases-json.yml index 707bef5d..418b758c 100644 --- a/.github/workflows/buildx-lab-releases-json.yml +++ b/.github/workflows/buildx-lab-releases-json.yml @@ -45,7 +45,7 @@ jobs: git add -A . - name: Create PR - uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc + uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e with: base: main branch: bot/buildx-lab-releases-json diff --git a/.github/workflows/buildx-releases-json.yml b/.github/workflows/buildx-releases-json.yml index a5eb4911..f6a1ae98 100644 --- a/.github/workflows/buildx-releases-json.yml +++ b/.github/workflows/buildx-releases-json.yml @@ -45,7 +45,7 @@ jobs: git add -A . - name: Create PR - uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc + uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e with: base: main branch: bot/buildx-releases-json diff --git a/.github/workflows/docker-releases-json.yml b/.github/workflows/docker-releases-json.yml index f3021809..9b2ae14a 100644 --- a/.github/workflows/docker-releases-json.yml +++ b/.github/workflows/docker-releases-json.yml @@ -45,7 +45,7 @@ jobs: git add -A . - name: Create PR - uses: peter-evans/create-pull-request@a4f52f8033a6168103c2538976c07b467e8163bc + uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e with: base: main branch: bot/docker-releases-json From 90c8d29f2954e7ba75b6f2cbbf0d63683121c347 Mon Sep 17 00:00:00 2001 From: crazy-max <1951866+crazy-max@users.noreply.github.com> Date: Wed, 13 Mar 2024 00:15:08 +0000 Subject: [PATCH 11/13] github: update .github/buildx-releases.json Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/buildx-releases.json | 115 ++++++++++++++++++++++++----------- 1 file changed, 78 insertions(+), 37 deletions(-) diff --git a/.github/buildx-releases.json b/.github/buildx-releases.json index 84b34423..56fad5ac 100644 --- a/.github/buildx-releases.json +++ b/.github/buildx-releases.json @@ -1,43 +1,84 @@ { "latest": { - "id": 144928424, - "tag_name": "v0.13.0", - "html_url": "https://github.com/docker/buildx/releases/tag/v0.13.0", + "id": 146098987, + "tag_name": "v0.13.1", + "html_url": "https://github.com/docker/buildx/releases/tag/v0.13.1", "assets": [ - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-amd64", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-amd64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-amd64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-arm64", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-arm64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.darwin-arm64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-amd64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v6.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm-v7.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-arm64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-ppc64le.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-riscv64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.linux-s390x.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.exe", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-amd64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.exe", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.provenance.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/buildx-v0.13.0.windows-arm64.sbom.json", - "https://github.com/docker/buildx/releases/download/v0.13.0/checksums.txt" + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-amd64", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-arm64", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.exe", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/checksums.txt" + ] + }, + "v0.13.1": { + "id": 146098987, + "tag_name": "v0.13.1", + "html_url": "https://github.com/docker/buildx/releases/tag/v0.13.1", + "assets": [ + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-amd64", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-arm64", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.darwin-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v6.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm-v7.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-ppc64le.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-riscv64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.linux-s390x.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.exe", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-amd64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.exe", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.provenance.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/buildx-v0.13.1.windows-arm64.sbom.json", + "https://github.com/docker/buildx/releases/download/v0.13.1/checksums.txt" ] }, "v0.13.0": { From d0e492964de74c9ebf4bd50a73c9214894dd9fcc Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Wed, 13 Mar 2024 19:02:35 +0100 Subject: [PATCH 12/13] ci: set version as comment for peter-evans/create-pull-request Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .github/workflows/buildx-lab-releases-json.yml | 2 +- .github/workflows/buildx-releases-json.yml | 2 +- .github/workflows/docker-releases-json.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/buildx-lab-releases-json.yml b/.github/workflows/buildx-lab-releases-json.yml index 418b758c..351efc70 100644 --- a/.github/workflows/buildx-lab-releases-json.yml +++ b/.github/workflows/buildx-lab-releases-json.yml @@ -45,7 +45,7 @@ jobs: git add -A . - name: Create PR - uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e + uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v6.0.2 with: base: main branch: bot/buildx-lab-releases-json diff --git a/.github/workflows/buildx-releases-json.yml b/.github/workflows/buildx-releases-json.yml index f6a1ae98..7f440f36 100644 --- a/.github/workflows/buildx-releases-json.yml +++ b/.github/workflows/buildx-releases-json.yml @@ -45,7 +45,7 @@ jobs: git add -A . - name: Create PR - uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e + uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v6.0.2 with: base: main branch: bot/buildx-releases-json diff --git a/.github/workflows/docker-releases-json.yml b/.github/workflows/docker-releases-json.yml index 9b2ae14a..a8fa9932 100644 --- a/.github/workflows/docker-releases-json.yml +++ b/.github/workflows/docker-releases-json.yml @@ -45,7 +45,7 @@ jobs: git add -A . - name: Create PR - uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e + uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e # v6.0.2 with: base: main branch: bot/docker-releases-json From 5fba0d037421912365d83923c334521e9633d924 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Wed, 13 Mar 2024 19:11:50 +0100 Subject: [PATCH 13/13] ci: disable tests on macos-13 runner Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6a04b54d..b975fcf9 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -89,7 +89,7 @@ jobs: test: ${{ fromJson(needs.prepare-itg.outputs.matrix) }} os: - ubuntu-latest - - macos-13 + #- macos-13 # https://github.com/docker/actions-toolkit/issues/279 - macos-latest - windows-latest steps: