Merge pull request #1183 from crazy-max/revert-gha-cache-to

revert "set repository and ghtoken attributes for gha cache type"
docker · Jul 17, 2024 · 1ca370b · 1ca370b
2 parents a254f8c + 2c95ebe
commit 1ca370b
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 24 deletions.
diff --git a/__tests__/context.test.ts b/__tests__/context.test.ts
@@ -799,27 +799,6 @@ ANOTHER_SECRET=ANOTHER_SECRET_ENV`]
  '.'
  ]
  ],
- [
- 34,
- '0.14.1',
- new Map<string, string>([
- ['context', '.'],
- ['load', 'false'],
- ['no-cache', 'false'],
- ['push', 'false'],
- ['pull', 'false'],
- ['cache-to', 'type=gha'],
- ['github-token', `abcd1234`],
- ]),
- [
- 'build',
- '--cache-to', 'type=gha,repository=docker/build-push-action,ghtoken=abcd1234',
- '--iidfile', imageIDFilePath,
- '--attest', `type=provenance,mode=min,inline-only=true,builder-id=https://github.com/docker/build-push-action/actions/runs/123456789/attempts/1`,
- '--metadata-file', metadataJson,
- '.'
- ]
- ],
  ])(
  '[%d] given %p with %p as inputs, returns %p',
  async (num: number, buildxVersion: string, inputs: Map<string, string>, expected: Array<string>) => {

diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/context.ts b/src/context.ts
@@ -139,7 +139,7 @@ async function getBuildArgs(inputs: Inputs, context: string, toolkit: Toolkit):
  args.push('--cache-from', cacheFrom);
  });
  await Util.asyncForEach(inputs['cache-to'], async cacheTo => {
- args.push('--cache-to', Build.resolveCacheToAttrs(cacheTo, inputs['github-token']));
+ args.push('--cache-to', cacheTo);
  });
  if (inputs['cgroup-parent']) {
  args.push('--cgroup-parent', inputs['cgroup-parent']);