mirror of
				https://github.com/docker/build-push-action.git
				synced 2025-11-04 00:10:55 +00:00 
			
		
		
		
	Merge pull request #111 from useblacksmith/fix-unnecessary-commti
src: only commit stickydisk in post step if in setup-only
This commit is contained in:
		
				commit
				
					
						7af3b3af33
					
				
			
		
					 4 changed files with 23 additions and 6 deletions
				
			
		
							
								
								
									
										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
											
										
									
								
							
							
								
								
									
										15
									
								
								src/main.ts
									
										
									
									
									
								
							
							
						
						
									
										15
									
								
								src/main.ts
									
										
									
									
									
								
							| 
						 | 
					@ -226,6 +226,7 @@ actionsToolkit.run(
 | 
				
			||||||
      // If setup-only is true, we don't want to continue configuring and running the build.
 | 
					      // If setup-only is true, we don't want to continue configuring and running the build.
 | 
				
			||||||
      if (inputs.setupOnly) {
 | 
					      if (inputs.setupOnly) {
 | 
				
			||||||
        core.info('setup-only mode enabled, builder is ready for use by Docker');
 | 
					        core.info('setup-only mode enabled, builder is ready for use by Docker');
 | 
				
			||||||
 | 
					        stateHelper.setSetupOnly(true);
 | 
				
			||||||
        // Let's remove the default
 | 
					        // Let's remove the default
 | 
				
			||||||
        process.exit(0);
 | 
					        process.exit(0);
 | 
				
			||||||
      }
 | 
					      }
 | 
				
			||||||
| 
						 | 
					@ -511,9 +512,17 @@ actionsToolkit.run(
 | 
				
			||||||
          core.debug(`Removed temp folder ${stateHelper.tmpDir}`);
 | 
					          core.debug(`Removed temp folder ${stateHelper.tmpDir}`);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        // 5. Commit sticky disk if it exists.
 | 
					        // 5. Commit sticky disk if the builder was booted in setup-only mode.
 | 
				
			||||||
        core.info('Committing sticky disk');
 | 
					        // If the builder was not booted in setup-only mode, the sticky disk was committed as part
 | 
				
			||||||
        await reporter.commitStickyDisk(stateHelper.getExposeId());
 | 
					        // of the main routine.
 | 
				
			||||||
 | 
					        if (stateHelper.getSetupOnly()) {
 | 
				
			||||||
 | 
					          core.info('Committing sticky disk in post cleanup as setup-only mode was enabled');
 | 
				
			||||||
 | 
					          if (stateHelper.getExposeId() !== '') {
 | 
				
			||||||
 | 
					            await reporter.commitStickyDisk(stateHelper.getExposeId());
 | 
				
			||||||
 | 
					          } else {
 | 
				
			||||||
 | 
					            core.warning('Expose ID not found in state, skipping sticky disk commit');
 | 
				
			||||||
 | 
					          }
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
      } catch (error) {
 | 
					      } catch (error) {
 | 
				
			||||||
        core.warning(`Error during final cleanup: ${error.message}`);
 | 
					        core.warning(`Error during final cleanup: ${error.message}`);
 | 
				
			||||||
        await reporter.reportBuildPushActionFailure(error, 'final cleanup');
 | 
					        await reporter.reportBuildPushActionFailure(error, 'final cleanup');
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -65,4 +65,12 @@ export function setExposeId(exposeId: string) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export function getExposeId(): string {
 | 
					export function getExposeId(): string {
 | 
				
			||||||
  return core.getState('exposeId');
 | 
					  return core.getState('exposeId');
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					export function setSetupOnly(setupOnly: boolean) {
 | 
				
			||||||
 | 
					  core.saveState('setupOnly', setupOnly.toString());
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					export function getSetupOnly(): boolean {
 | 
				
			||||||
 | 
					  return core.getState('setupOnly') === 'true';
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue