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

revert "set repository and ghtoken attributes for gha cache type"
This commit is contained in:
CrazyMax 2024-07-17 11:01:30 +02:00 committed by GitHub
commit 1ca370b3a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 3 additions and 24 deletions

View file

@ -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>) => {

2
dist/index.js generated vendored

File diff suppressed because one or more lines are too long

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long

View file

@ -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']);