chore: sync from upstream docker/bake-action master

.github/dependabot.yml

@@ -19,7 +19,9 @@ updates:
       - "dependencies"
       - "bot"
   - package-ecosystem: "npm"
-    directory: "/"
+    directories:
+      - "/"
+      - "/subaction/matrix"
     schedule:
       interval: "daily"
     cooldown:

.github/workflows/ci-subaction.yml

@@ -63,7 +63,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       -
         name: Matrix gen
         id: gen

.github/workflows/codeql.yml

@@ -22,25 +22,25 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       -
         name: Enable corepack
         run: |
           corepack enable
           yarn --version
       -
         name: Set up Node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version: ${{ env.NODE_VERSION }}
       -
         name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/init@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
         with:
           languages: javascript-typescript
           build-mode: none
       -
         name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/analyze@b96794f015dfd88f77b49b1c93e0fa7110f94c63 # v4.38.0
         with:
           category: "/language:javascript-typescript"

.github/workflows/pr-assign-author.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   run:
-    uses: crazy-max/.github/.github/workflows/pr-assign-author.yml@46267a6e61cd56aac2fc79943df180152f4c89d6 # v1.10.1
+    uses: crazy-max/.github/.github/workflows/pr-assign-author.yml@f91220cba053bd54299ba645a599ee8ed436f222 # v1.11.0
     permissions:
       contents: read
       pull-requests: write

.github/workflows/publish.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       -
         name: Publish
         uses: actions/publish-immutable-action@4bc8754ffc40f27910afb20287dbbbb675a4e978 # v0.0.4

.github/workflows/test.yml

@@ -26,16 +26,16 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       -
         name: Test
-        uses: docker/bake-action@6614cfa25eff9a0b2b2697efb0b6159e7680d584 # v7.2.0
+        uses: docker/bake-action@d3418bd7d0e9324001bca92fa8ba175ea7e6dc9b # v7.3.0
         with:
           source: .
           targets: test
       -
         name: Upload coverage
-        uses: codecov/codecov-action@fb8b3582c8e4def4969c97caa2f19720cb33a72f # v7.0.0
+        uses: codecov/codecov-action@0b35c9ecc4f0529d0eb674914510c22f85b196b4 # v7.1.0
         with:
           files: ./coverage/clover.xml
           token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/update-dist.yml

@@ -30,26 +30,26 @@ jobs:
           permission-contents: write
       -
         name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
         with:
           ref: ${{ github.event.pull_request.head.ref }}
           fetch-depth: 0
           token: ${{ steps.docker-read-app.outputs.token }}
       -
         name: Build
-        uses: docker/bake-action@6614cfa25eff9a0b2b2697efb0b6159e7680d584 # v7.2.0
+        uses: docker/bake-action@d3418bd7d0e9324001bca92fa8ba175ea7e6dc9b # v7.3.0
         with:
           source: .
           targets: build
       -
         name: Commit and push dist
         run: |
-          if [ -n "$(git status --porcelain -- dist)" ]; then
+          if [ -n "$(git status --porcelain -- dist subaction/matrix/dist)" ]; then
             (
               set -x
               git config user.name "github-actions[bot]"
               git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-              git add dist
+              git add dist subaction/matrix/dist
               git commit -m "[dependabot skip] chore: update generated content"
               git push
             )

.github/workflows/validate.yml

@@ -22,7 +22,7 @@ jobs:
     steps:
       -
         name: Checkout
-        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       -
         name: List targets
         id: generate
@@ -41,6 +41,6 @@ jobs:
     steps:
       -
         name: Validate
-        uses: docker/bake-action@6614cfa25eff9a0b2b2697efb0b6159e7680d584 # v7.2.0
+        uses: docker/bake-action@d3418bd7d0e9324001bca92fa8ba175ea7e6dc9b # v7.3.0
         with:
           targets: ${{ matrix.target }}

.github/workflows/zizmor.yml

@@ -19,7 +19,7 @@ on:
 
 jobs:
   zizmor:
-    uses: crazy-max/.github/.github/workflows/zizmor.yml@46267a6e61cd56aac2fc79943df180152f4c89d6 # v1.10.1
+    uses: crazy-max/.github/.github/workflows/zizmor.yml@f91220cba053bd54299ba645a599ee8ed436f222 # v1.11.0
     permissions:
       contents: read
       security-events: write

dev.Dockerfile

@@ -40,10 +40,12 @@ RUN --mount=target=/context \
   --mount=type=cache,target=/src/node_modules <<EOT
   set -e
   rsync -a /context/. .
-  rm -rf dist
-  yarn run build
+  rm -rf dist subaction/matrix/dist
+  yarn workspaces foreach --all run build
   mkdir /out
   cp -r dist /out
+  mkdir -p /out/subaction/matrix
+  cp -r subaction/matrix/dist /out/subaction/matrix
 EOT
 
 FROM scratch AS build-update
@@ -55,9 +57,9 @@ RUN --mount=target=/context \
   set -e
   rsync -a /context/. .
   git add -A
-  rm -rf dist
+  rm -rf dist subaction/matrix/dist
   cp -rf /out/* .
-  if [ -n "$(git status --porcelain -- dist)" ]; then
+  if [ -n "$(git status --porcelain -- dist subaction/matrix/dist)" ]; then
     echo >&2 'ERROR: Build result differs. Please build first with "docker buildx bake build"'
     git status --porcelain -- dist
     exit 1

eslint.config.mjs

@@ -8,7 +8,7 @@ import eslintPluginPrettier from 'eslint-plugin-prettier';
 
 export default defineConfig([
   {
-    ignores: ['.yarn/**/*', 'coverage/**/*', 'dist/**/*']
+    ignores: ['.yarn/**/*', 'coverage/**/*', 'dist/**/*', 'subaction/matrix/dist/**/*']
   },
   js.configs.recommended,
   ...tseslint.configs['flat/recommended'],

package.json

@@ -10,6 +10,9 @@
     "test": "vitest run",
     "license": "generate-license-file --input package.json --output dist/licenses.txt --overwrite --ci --no-spinner --eol lf"
   },
+  "workspaces": [
+    "subaction/matrix"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/docker/bake-action.git"
@@ -25,17 +28,11 @@
   "packageManager": "yarn@4.15.0",
   "dependencies": {
     "@actions/core": "^3.0.1",
-    "@docker/actions-toolkit": "^0.92.0",
-    "handlebars": "^4.7.9",
-    "uuid": "^11.1.1"
+    "@docker/actions-toolkit": "^0.100.0",
+    "handlebars": "^4.7.9"
   },
   "resolutions": {
-    "undici": "^6.27.0",
-    "fast-xml-parser": "^5.7.2",
-    "tar": "^7.5.19",
-    "lodash": "^4.18.1",
-    "flatted": "^3.3.4",
-    "uuid": "^11.1.1"
+    "tar": "^7.5.19"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.3",

src/main.ts

@@ -182,8 +182,8 @@ actionsToolkit.run(
             // if there are no warnings found, return the first line of stdout
             err = Error(res.stdout.split('\n')[0]?.trim());
           }
-        } else if (res.stderr.length > 0) {
-          err = Error(`buildx bake failed with: ${res.stderr.match(/(.*)\s*$/)?.[0]?.trim() ?? 'unknown error'}`);
+        } else {
+          err = Error(`buildx bake failed with: ${Buildx.getErrorMessage(res.stderr)}`);
         }
       }
     });
@@ -192,7 +192,7 @@ actionsToolkit.run(
     if (metadata) {
       await core.group(`Metadata`, async () => {
         const metadatadt = JSON.stringify(metadata, null, 2);
-        core.info(metadatadt);
+        GitHub.printUntrusted(metadatadt);
         core.setOutput('metadata', metadatadt);
       });
     }

src/warpbuild.ts

@@ -3,7 +3,7 @@ import * as os from 'os';
 import * as path from 'path';
 import {exec} from 'child_process';
 import {promisify} from 'util';
-import {v4 as uuidv4} from 'uuid';
+import {randomUUID} from 'crypto';
 import * as core from '@actions/core';
 
 const execAsync = promisify(exec);
@@ -62,7 +62,7 @@ export class WarpBuildRemoteBuilders {
     this.isWarpBuildRunner = this.determineRunnerType();
     // Example output: lq1cr8p2n5x7d3fy
     // Generate a more random idempotency key using UUID
-    this.idempotencyKey = uuidv4().replace(/-/g, '').substring(0, 16);
+    this.idempotencyKey = randomUUID().replace(/-/g, '').substring(0, 16);
     this.builderName = `builder-${this.idempotencyKey}`;
 
     core.debug(`API domain: ${this.apiDomain}`);