mirror of
				https://github.com/docker/login-action.git
				synced 2025-10-31 01:40:11 +08:00 
			
		
		
		
	Merge pull request #73 from docker/dependabot/npm_and_yarn/actions/exec-1.1.0
Bump @actions/exec from 1.0.4 to 1.1.0
This commit is contained in:
		
						commit
						e2346b6971
					
				
							
								
								
									
										135
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										135
									
								
								dist/index.js
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -924,6 +924,25 @@ module.exports = compareBuild | ||||
| 
 | ||||
| "use strict"; | ||||
| 
 | ||||
| var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { | ||||
|     if (k2 === undefined) k2 = k; | ||||
|     Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); | ||||
| }) : (function(o, m, k, k2) { | ||||
|     if (k2 === undefined) k2 = k; | ||||
|     o[k2] = m[k]; | ||||
| })); | ||||
| var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { | ||||
|     Object.defineProperty(o, "default", { enumerable: true, value: v }); | ||||
| }) : function(o, v) { | ||||
|     o["default"] = v; | ||||
| }); | ||||
| var __importStar = (this && this.__importStar) || function (mod) { | ||||
|     if (mod && mod.__esModule) return mod; | ||||
|     var result = {}; | ||||
|     if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||||
|     __setModuleDefault(result, mod); | ||||
|     return result; | ||||
| }; | ||||
| var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { | ||||
|     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } | ||||
|     return new (P || (P = Promise))(function (resolve, reject) { | ||||
| @ -933,20 +952,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge | ||||
|         step((generator = generator.apply(thisArg, _arguments || [])).next()); | ||||
|     }); | ||||
| }; | ||||
| var __importStar = (this && this.__importStar) || function (mod) { | ||||
|     if (mod && mod.__esModule) return mod; | ||||
|     var result = {}; | ||||
|     if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; | ||||
|     result["default"] = mod; | ||||
|     return result; | ||||
| }; | ||||
| Object.defineProperty(exports, "__esModule", { value: true }); | ||||
| exports.argStringToArray = exports.ToolRunner = void 0; | ||||
| const os = __importStar(__webpack_require__(87)); | ||||
| const events = __importStar(__webpack_require__(614)); | ||||
| const child = __importStar(__webpack_require__(4)); | ||||
| const path = __importStar(__webpack_require__(622)); | ||||
| const io = __importStar(__webpack_require__(436)); | ||||
| const ioUtil = __importStar(__webpack_require__(962)); | ||||
| const timers_1 = __webpack_require__(213); | ||||
| /* eslint-disable @typescript-eslint/unbound-method */ | ||||
| const IS_WINDOWS = process.platform === 'win32'; | ||||
| /* | ||||
| @ -1016,11 +1030,12 @@ class ToolRunner extends events.EventEmitter { | ||||
|                 s = s.substring(n + os.EOL.length); | ||||
|                 n = s.indexOf(os.EOL); | ||||
|             } | ||||
|             strBuffer = s; | ||||
|             return s; | ||||
|         } | ||||
|         catch (err) { | ||||
|             // streaming lines to console is best effort.  Don't fail a build.
 | ||||
|             this._debug(`error processing line. Failed with error ${err}`); | ||||
|             return ''; | ||||
|         } | ||||
|     } | ||||
|     _getSpawnFileName() { | ||||
| @ -1302,7 +1317,7 @@ class ToolRunner extends events.EventEmitter { | ||||
|             // if the tool is only a file name, then resolve it from the PATH
 | ||||
|             // otherwise verify it exists (add extension on Windows if necessary)
 | ||||
|             this.toolPath = yield io.which(this.toolPath, true); | ||||
|             return new Promise((resolve, reject) => { | ||||
|             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () { | ||||
|                 this._debug(`exec tool: ${this.toolPath}`); | ||||
|                 this._debug('arguments:'); | ||||
|                 for (const arg of this.args) { | ||||
| @ -1316,9 +1331,12 @@ class ToolRunner extends events.EventEmitter { | ||||
|                 state.on('debug', (message) => { | ||||
|                     this._debug(message); | ||||
|                 }); | ||||
|                 if (this.options.cwd && !(yield ioUtil.exists(this.options.cwd))) { | ||||
|                     return reject(new Error(`The cwd: ${this.options.cwd} does not exist!`)); | ||||
|                 } | ||||
|                 const fileName = this._getSpawnFileName(); | ||||
|                 const cp = child.spawn(fileName, this._getSpawnArgs(optionsNonNull), this._getSpawnOptions(this.options, fileName)); | ||||
|                 const stdbuffer = ''; | ||||
|                 let stdbuffer = ''; | ||||
|                 if (cp.stdout) { | ||||
|                     cp.stdout.on('data', (data) => { | ||||
|                         if (this.options.listeners && this.options.listeners.stdout) { | ||||
| @ -1327,14 +1345,14 @@ class ToolRunner extends events.EventEmitter { | ||||
|                         if (!optionsNonNull.silent && optionsNonNull.outStream) { | ||||
|                             optionsNonNull.outStream.write(data); | ||||
|                         } | ||||
|                         this._processLineBuffer(data, stdbuffer, (line) => { | ||||
|                         stdbuffer = this._processLineBuffer(data, stdbuffer, (line) => { | ||||
|                             if (this.options.listeners && this.options.listeners.stdline) { | ||||
|                                 this.options.listeners.stdline(line); | ||||
|                             } | ||||
|                         }); | ||||
|                     }); | ||||
|                 } | ||||
|                 const errbuffer = ''; | ||||
|                 let errbuffer = ''; | ||||
|                 if (cp.stderr) { | ||||
|                     cp.stderr.on('data', (data) => { | ||||
|                         state.processStderr = true; | ||||
| @ -1349,7 +1367,7 @@ class ToolRunner extends events.EventEmitter { | ||||
|                                 : optionsNonNull.outStream; | ||||
|                             s.write(data); | ||||
|                         } | ||||
|                         this._processLineBuffer(data, errbuffer, (line) => { | ||||
|                         errbuffer = this._processLineBuffer(data, errbuffer, (line) => { | ||||
|                             if (this.options.listeners && this.options.listeners.errline) { | ||||
|                                 this.options.listeners.errline(line); | ||||
|                             } | ||||
| @ -1396,7 +1414,7 @@ class ToolRunner extends events.EventEmitter { | ||||
|                     } | ||||
|                     cp.stdin.end(this.options.input); | ||||
|                 } | ||||
|             }); | ||||
|             })); | ||||
|         }); | ||||
|     } | ||||
| } | ||||
| @ -1482,7 +1500,7 @@ class ExecState extends events.EventEmitter { | ||||
|             this._setResult(); | ||||
|         } | ||||
|         else if (this.processExited) { | ||||
|             this.timeout = setTimeout(ExecState.HandleTimeout, this.delay, this); | ||||
|             this.timeout = timers_1.setTimeout(ExecState.HandleTimeout, this.delay, this); | ||||
|         } | ||||
|     } | ||||
|     _debug(message) { | ||||
| @ -1902,6 +1920,13 @@ const lt = (a, b, loose) => compare(a, b, loose) < 0 | ||||
| module.exports = lt | ||||
| 
 | ||||
| 
 | ||||
| /***/ }), | ||||
| 
 | ||||
| /***/ 213: | ||||
| /***/ (function(module) { | ||||
| 
 | ||||
| module.exports = require("timers"); | ||||
| 
 | ||||
| /***/ }), | ||||
| 
 | ||||
| /***/ 278: | ||||
| @ -1983,6 +2008,13 @@ const diff = (version1, version2) => { | ||||
| module.exports = diff | ||||
| 
 | ||||
| 
 | ||||
| /***/ }), | ||||
| 
 | ||||
| /***/ 304: | ||||
| /***/ (function(module) { | ||||
| 
 | ||||
| module.exports = require("string_decoder"); | ||||
| 
 | ||||
| /***/ }), | ||||
| 
 | ||||
| /***/ 309: | ||||
| @ -2754,6 +2786,25 @@ module.exports = coerce | ||||
| 
 | ||||
| "use strict"; | ||||
| 
 | ||||
| var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { | ||||
|     if (k2 === undefined) k2 = k; | ||||
|     Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); | ||||
| }) : (function(o, m, k, k2) { | ||||
|     if (k2 === undefined) k2 = k; | ||||
|     o[k2] = m[k]; | ||||
| })); | ||||
| var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) { | ||||
|     Object.defineProperty(o, "default", { enumerable: true, value: v }); | ||||
| }) : function(o, v) { | ||||
|     o["default"] = v; | ||||
| }); | ||||
| var __importStar = (this && this.__importStar) || function (mod) { | ||||
|     if (mod && mod.__esModule) return mod; | ||||
|     var result = {}; | ||||
|     if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k); | ||||
|     __setModuleDefault(result, mod); | ||||
|     return result; | ||||
| }; | ||||
| var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { | ||||
|     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); } | ||||
|     return new (P || (P = Promise))(function (resolve, reject) { | ||||
| @ -2763,14 +2814,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge | ||||
|         step((generator = generator.apply(thisArg, _arguments || [])).next()); | ||||
|     }); | ||||
| }; | ||||
| var __importStar = (this && this.__importStar) || function (mod) { | ||||
|     if (mod && mod.__esModule) return mod; | ||||
|     var result = {}; | ||||
|     if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; | ||||
|     result["default"] = mod; | ||||
|     return result; | ||||
| }; | ||||
| Object.defineProperty(exports, "__esModule", { value: true }); | ||||
| exports.getExecOutput = exports.exec = void 0; | ||||
| const string_decoder_1 = __webpack_require__(304); | ||||
| const tr = __importStar(__webpack_require__(159)); | ||||
| /** | ||||
|  * Exec a command. | ||||
| @ -2796,6 +2842,51 @@ function exec(commandLine, args, options) { | ||||
|     }); | ||||
| } | ||||
| exports.exec = exec; | ||||
| /** | ||||
|  * Exec a command and get the output. | ||||
|  * Output will be streamed to the live console. | ||||
|  * Returns promise with the exit code and collected stdout and stderr | ||||
|  * | ||||
|  * @param     commandLine           command to execute (can include additional args). Must be correctly escaped. | ||||
|  * @param     args                  optional arguments for tool. Escaping is handled by the lib. | ||||
|  * @param     options               optional exec options.  See ExecOptions | ||||
|  * @returns   Promise<ExecOutput>   exit code, stdout, and stderr | ||||
|  */ | ||||
| function getExecOutput(commandLine, args, options) { | ||||
|     var _a, _b; | ||||
|     return __awaiter(this, void 0, void 0, function* () { | ||||
|         let stdout = ''; | ||||
|         let stderr = ''; | ||||
|         //Using string decoder covers the case where a mult-byte character is split
 | ||||
|         const stdoutDecoder = new string_decoder_1.StringDecoder('utf8'); | ||||
|         const stderrDecoder = new string_decoder_1.StringDecoder('utf8'); | ||||
|         const originalStdoutListener = (_a = options === null || options === void 0 ? void 0 : options.listeners) === null || _a === void 0 ? void 0 : _a.stdout; | ||||
|         const originalStdErrListener = (_b = options === null || options === void 0 ? void 0 : options.listeners) === null || _b === void 0 ? void 0 : _b.stderr; | ||||
|         const stdErrListener = (data) => { | ||||
|             stderr += stderrDecoder.write(data); | ||||
|             if (originalStdErrListener) { | ||||
|                 originalStdErrListener(data); | ||||
|             } | ||||
|         }; | ||||
|         const stdOutListener = (data) => { | ||||
|             stdout += stdoutDecoder.write(data); | ||||
|             if (originalStdoutListener) { | ||||
|                 originalStdoutListener(data); | ||||
|             } | ||||
|         }; | ||||
|         const listeners = Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.listeners), { stdout: stdOutListener, stderr: stdErrListener }); | ||||
|         const exitCode = yield exec(commandLine, args, Object.assign(Object.assign({}, options), { listeners })); | ||||
|         //flush any remaining characters
 | ||||
|         stdout += stdoutDecoder.end(); | ||||
|         stderr += stderrDecoder.end(); | ||||
|         return { | ||||
|             exitCode, | ||||
|             stdout, | ||||
|             stderr | ||||
|         }; | ||||
|     }); | ||||
| } | ||||
| exports.getExecOutput = getExecOutput; | ||||
| //# sourceMappingURL=exec.js.map
 | ||||
| 
 | ||||
| /***/ }), | ||||
|  | ||||
| @ -28,7 +28,7 @@ | ||||
|   "license": "MIT", | ||||
|   "dependencies": { | ||||
|     "@actions/core": "^1.4.0", | ||||
|     "@actions/exec": "^1.0.4", | ||||
|     "@actions/exec": "^1.1.0", | ||||
|     "@actions/io": "^1.1.1", | ||||
|     "semver": "^7.3.5" | ||||
|   }, | ||||
|  | ||||
| @ -7,10 +7,10 @@ | ||||
|   resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.4.0.tgz#cf2e6ee317e314b03886adfeb20e448d50d6e524" | ||||
|   integrity sha512-CGx2ilGq5i7zSLgiiGUtBCxhRRxibJYU6Fim0Q1Wg2aQL2LTnF27zbqZOrxfvFQ55eSBW0L8uVStgtKMpa0Qlg== | ||||
| 
 | ||||
| "@actions/exec@^1.0.4": | ||||
|   version "1.0.4" | ||||
|   resolved "https://registry.yarnpkg.com/@actions/exec/-/exec-1.0.4.tgz#99d75310e62e59fc37d2ee6dcff6d4bffadd3a5d" | ||||
|   integrity sha512-4DPChWow9yc9W3WqEbUj8Nr86xkpyE29ZzWjXucHItclLbEW6jr80Zx4nqv18QL6KK65+cifiQZXvnqgTV6oHw== | ||||
| "@actions/exec@^1.1.0": | ||||
|   version "1.1.0" | ||||
|   resolved "https://registry.yarnpkg.com/@actions/exec/-/exec-1.1.0.tgz#53441d968e56d2fec69ad3f15773d4d94e01162c" | ||||
|   integrity sha512-LImpN9AY0J1R1mEYJjVJfSZWU4zYOlEcwSTgPve1rFQqK5AwrEs6uWW5Rv70gbDIQIAUwI86z6B+9mPK4w9Sbg== | ||||
|   dependencies: | ||||
|     "@actions/io" "^1.0.1" | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 CrazyMax
						CrazyMax