Merge pull request #12 from depot/update

Fix parsing of set input
depot · May 9, 2023 · e33f31f · e33f31f
2 parents 6cb9697 + 00614c5
commit e33f31f
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 33 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/package.json b/package.json
@@ -3,15 +3,16 @@
   "scripts": {
     "build": "node build.cjs",
     "fmt": "prettier --write .",
-    "fmt:check": "prettier --check ."
+    "fmt:check": "prettier --check .",
+    "type-check": "tsc --noEmit"
   },
   "dependencies": {
     "@actions/core": "^1.10.0",
     "@actions/exec": "^1.1.1",
     "@actions/github": "^5.1.1",
     "@actions/http-client": "^2.1.0",
     "@actions/io": "^1.1.3",
-    "@docker/actions-toolkit": "^0.1.0",
+    "@docker/actions-toolkit": "^0.2.0",
     "csv-parse": "^5.3.6",
     "execa": "^7.1.1"
   },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/context.ts b/src/context.ts
@@ -1,5 +1,6 @@
 import * as core from '@actions/core'
 import * as github from '@actions/github'
+import {Util} from '@docker/actions-toolkit/lib/util'
 import * as csv from 'csv-parse/sync'
 import * as fs from 'fs'
 import * as os from 'os'
@@ -34,7 +35,7 @@ export function getInputs(): Inputs {
     provenance: getProvenanceInput(),
     push: core.getBooleanInput('push'),
     sbom: core.getInput('sbom'),
-    set: parseCSV(core.getInput('set')),
+    set: Util.getInputList('set', {ignoreComma: true, quote: false}),
     source: core.getInput('source'),
     project: core.getInput('project'),
     token: core.getInput('token') || process.env.DEPOT_TOKEN,

diff --git a/src/depot.ts b/src/depot.ts
@@ -69,7 +69,14 @@ export async function bake(inputs: Inputs) {
   ]
 
   const toolkit = new Toolkit()
-  const bakedef = await toolkit.bake.parseDefinitions([...inputs.files, inputs.source], inputs.targets, inputs.workdir)
+  const bakedef = await toolkit.bake.parseDefinitions(
+    [...inputs.files, inputs.source],
+    inputs.targets,
+    inputs.set,
+    inputs.load,
+    inputs.push,
+    inputs.workdir,
+  )
   if (inputs.provenance) {
     bakeArgs.push('--provenance', inputs.provenance)
   } else if (!Bake.hasDockerExporter(bakedef, inputs.load)) {