mirror of
				https://github.com/docker/setup-buildx-action.git
				synced 2025-10-31 01:20:09 +08:00 
			
		
		
		
	Remove workaround for setOutput
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
This commit is contained in:
		
							parent
							
								
									90a1e4619e
								
							
						
					
					
						commit
						40fefd8a58
					
				| @ -172,30 +172,6 @@ describe('asyncForEach', () => { | |||||||
|   }); |   }); | ||||||
| }); | }); | ||||||
| 
 | 
 | ||||||
| describe('setOutput', () => { |  | ||||||
|   beforeEach(() => { |  | ||||||
|     process.stdout.write = jest.fn() as typeof process.stdout.write; |  | ||||||
|   }); |  | ||||||
| 
 |  | ||||||
|   // eslint-disable-next-line jest/expect-expect
 |  | ||||||
|   it('setOutput produces the correct command', () => { |  | ||||||
|     context.setOutput('some output', 'some value'); |  | ||||||
|     assertWriteCalls([`::set-output name=some output::some value${os.EOL}`]); |  | ||||||
|   }); |  | ||||||
| 
 |  | ||||||
|   // eslint-disable-next-line jest/expect-expect
 |  | ||||||
|   it('setOutput handles bools', () => { |  | ||||||
|     context.setOutput('some output', false); |  | ||||||
|     assertWriteCalls([`::set-output name=some output::false${os.EOL}`]); |  | ||||||
|   }); |  | ||||||
| 
 |  | ||||||
|   // eslint-disable-next-line jest/expect-expect
 |  | ||||||
|   it('setOutput handles numbers', () => { |  | ||||||
|     context.setOutput('some output', 1.01); |  | ||||||
|     assertWriteCalls([`::set-output name=some output::1.01${os.EOL}`]); |  | ||||||
|   }); |  | ||||||
| }); |  | ||||||
| 
 |  | ||||||
| // See: https://github.com/actions/toolkit/blob/master/packages/core/src/core.ts#L67
 | // See: https://github.com/actions/toolkit/blob/master/packages/core/src/core.ts#L67
 | ||||||
| function getInputName(name: string): string { | function getInputName(name: string): string { | ||||||
|   return `INPUT_${name.replace(/ /g, '_').toUpperCase()}`; |   return `INPUT_${name.replace(/ /g, '_').toUpperCase()}`; | ||||||
| @ -204,11 +180,3 @@ function getInputName(name: string): string { | |||||||
| function setInput(name: string, value: string): void { | function setInput(name: string, value: string): void { | ||||||
|   process.env[getInputName(name)] = value; |   process.env[getInputName(name)] = value; | ||||||
| } | } | ||||||
| 
 |  | ||||||
| // Assert that process.stdout.write calls called only with the given arguments.
 |  | ||||||
| function assertWriteCalls(calls: string[]): void { |  | ||||||
|   expect(process.stdout.write).toHaveBeenCalledTimes(calls.length); |  | ||||||
|   for (let i = 0; i < calls.length; i++) { |  | ||||||
|     expect(process.stdout.write).toHaveBeenNthCalledWith(i + 1, calls[i]); |  | ||||||
|   } |  | ||||||
| } |  | ||||||
|  | |||||||
							
								
								
									
										2
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
							
								
								
									
										2
									
								
								dist/index.js.map
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								dist/index.js.map
									
									
									
										generated
									
									
										vendored
									
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -5,7 +5,6 @@ import * as tmp from 'tmp'; | |||||||
| import * as uuid from 'uuid'; | import * as uuid from 'uuid'; | ||||||
| import * as buildx from './buildx'; | import * as buildx from './buildx'; | ||||||
| import * as core from '@actions/core'; | import * as core from '@actions/core'; | ||||||
| import {issueCommand} from '@actions/core/lib/command'; |  | ||||||
| 
 | 
 | ||||||
| let _tmpDir: string; | let _tmpDir: string; | ||||||
| export const osPlat: string = os.platform(); | export const osPlat: string = os.platform(); | ||||||
| @ -104,8 +103,3 @@ export const asyncForEach = async (array, callback) => { | |||||||
|     await callback(array[index], index, array); |     await callback(array[index], index, array); | ||||||
|   } |   } | ||||||
| }; | }; | ||||||
| 
 |  | ||||||
| // FIXME: Temp fix https://github.com/actions/toolkit/issues/777
 |  | ||||||
| export function setOutput(name: string, value: unknown): void { |  | ||||||
|   issueCommand('set-output', {name}, value); |  | ||||||
| } |  | ||||||
|  | |||||||
							
								
								
									
										14
									
								
								src/main.ts
									
									
									
									
									
								
							
							
						
						
									
										14
									
								
								src/main.ts
									
									
									
									
									
								
							| @ -53,7 +53,7 @@ async function run(): Promise<void> { | |||||||
|       }); |       }); | ||||||
|     }); |     }); | ||||||
| 
 | 
 | ||||||
|     context.setOutput('name', inputs.name); |     core.setOutput('name', inputs.name); | ||||||
|     stateHelper.setBuilderName(inputs.name); |     stateHelper.setBuilderName(inputs.name); | ||||||
| 
 | 
 | ||||||
|     const credsdir = path.join(dockerConfigHome, 'buildx', 'creds', inputs.name); |     const credsdir = path.join(dockerConfigHome, 'buildx', 'creds', inputs.name); | ||||||
| @ -89,12 +89,12 @@ async function run(): Promise<void> { | |||||||
|     const builder = await buildx.inspect(inputs.name, standalone); |     const builder = await buildx.inspect(inputs.name, standalone); | ||||||
|     const firstNode = builder.nodes[0]; |     const firstNode = builder.nodes[0]; | ||||||
|     core.info(JSON.stringify(builder, undefined, 2)); |     core.info(JSON.stringify(builder, undefined, 2)); | ||||||
|     context.setOutput('driver', builder.driver); |     core.setOutput('driver', builder.driver); | ||||||
|     context.setOutput('platforms', firstNode.platforms); |     core.setOutput('platforms', firstNode.platforms); | ||||||
|     context.setOutput('nodes', JSON.stringify(builder.nodes, undefined, 2)); |     core.setOutput('nodes', JSON.stringify(builder.nodes, undefined, 2)); | ||||||
|     context.setOutput('endpoint', firstNode.endpoint); // TODO: deprecated, to be removed in a later version
 |     core.setOutput('endpoint', firstNode.endpoint); // TODO: deprecated, to be removed in a later version
 | ||||||
|     context.setOutput('status', firstNode.status); // TODO: deprecated, to be removed in a later version
 |     core.setOutput('status', firstNode.status); // TODO: deprecated, to be removed in a later version
 | ||||||
|     context.setOutput('flags', firstNode['buildkitd-flags']); // TODO: deprecated, to be removed in a later version
 |     core.setOutput('flags', firstNode['buildkitd-flags']); // TODO: deprecated, to be removed in a later version
 | ||||||
|     core.endGroup(); |     core.endGroup(); | ||||||
| 
 | 
 | ||||||
|     if (!standalone && builder.driver == 'docker-container') { |     if (!standalone && builder.driver == 'docker-container') { | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 CrazyMax
						CrazyMax