diff --git a/dist/npmci.bash.js b/dist/npmci.bash.js index 38a0fee..dae5a6d 100644 --- a/dist/npmci.bash.js +++ b/dist/npmci.bash.js @@ -76,6 +76,7 @@ exports.bash = (commandArg, retryArg = 2, bareArg = false) => __awaiter(this, vo } else { plugins.beautylog.log('ShellExec would be: ' + commandArg); + yield plugins.smartdelay.delayFor(100); execResult = { exitCode: 0, stdout: 'testOutput' @@ -95,4 +96,4 @@ exports.bashBare = (commandArg, retryArg = 2) => __awaiter(this, void 0, void 0, exports.bashNoError = (commandArg) => __awaiter(this, void 0, void 0, function* () { return yield exports.bash(commandArg, -1); }); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyxpQ0FBZ0M7QUFFaEM7O0dBRUc7QUFDUSxRQUFBLFlBQVksR0FBRyxNQUFNLENBQUMsS0FBSyxFQUFXLENBQUE7QUFFakQ7O0dBRUc7QUFDSCxJQUFJLGVBQWUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDO0lBQ3RELFFBQVEsRUFBRSxNQUFNO0lBQ2hCLGVBQWUsRUFBRSxFQUFFO0NBQ3BCLENBQUMsQ0FBQTtBQUVGLElBQUksUUFBUSxHQUFHO0lBQ2IsRUFBRSxDQUFDLENBQ0QsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLHdDQUF3QyxDQUFDLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FDL0YsQ0FBQyxDQUFDLENBQUM7UUFDRCxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUMsMkJBQTJCLENBQUMsQ0FBQyxDQUFBO1FBQzdELG9CQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQ1IsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLGdDQUFnQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FDdkYsQ0FBQyxDQUFDLENBQUM7UUFDRCxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFBO1FBQ3JELG9CQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLG9CQUFZLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzdCLENBQUM7SUFBQSxDQUFDO0FBQ0osQ0FBQyxDQUFBLENBQUE7QUFDRCxR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 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kuYmFzaC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLmJhc2gudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLDJDQUEwQztBQUMxQyxpQ0FBZ0M7QUFFaEM7O0dBRUc7QUFDUSxRQUFBLFlBQVksR0FBRyxNQUFNLENBQUMsS0FBSyxFQUFXLENBQUE7QUFFakQ7O0dBRUc7QUFDSCxJQUFJLGVBQWUsR0FBRyxJQUFJLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDO0lBQ3RELFFBQVEsRUFBRSxNQUFNO0lBQ2hCLGVBQWUsRUFBRSxFQUFFO0NBQ3BCLENBQUMsQ0FBQTtBQUVGLElBQUksUUFBUSxHQUFHO0lBQ2IsRUFBRSxDQUFDLENBQ0QsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLHdDQUF3QyxDQUFDLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FDL0YsQ0FBQyxDQUFDLENBQUM7UUFDRCxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUMsMkJBQTJCLENBQUMsQ0FBQyxDQUFBO1FBQzdELG9CQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQ1IsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxVQUFVLENBQUMsVUFBVSxDQUFDLGdDQUFnQyxDQUFDLENBQUMsQ0FBQyxRQUFRLEtBQUssQ0FDdkYsQ0FBQyxDQUFDLENBQUM7UUFDRCxlQUFlLENBQUMsY0FBYyxDQUFDLENBQUMsbUJBQW1CLENBQUMsQ0FBQyxDQUFBO1FBQ3JELG9CQUFZLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQzVCLENBQUM7SUFBQyxJQUFJLENBQUMsQ0FBQztRQUNOLG9CQUFZLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFBO0lBQzdCLENBQUM7SUFBQSxDQUFDO0FBQ0osQ0FBQyxDQUFBLENBQUE7QUFDRCxR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 \ No newline at end of file diff --git a/dist/npmci.build.docker.js b/dist/npmci.build.docker.js index 06dd945..56977c8 100644 --- a/dist/npmci.build.docker.js +++ b/dist/npmci.build.docker.js @@ -93,20 +93,18 @@ exports.mapDockerfiles = (sortedArray) => __awaiter(this, void 0, void 0, functi * builds the correspoding real docker image for each Dockerfile class instance */ exports.buildDockerfiles = (sortedArrayArg) => __awaiter(this, void 0, void 0, function* () { - sortedArrayArg.forEach(function (dockerfileArg) { - return __awaiter(this, void 0, void 0, function* () { - yield dockerfileArg.build(); - }); - }); + for (let dockerfileArg of sortedArrayArg) { + yield dockerfileArg.build(); + } return sortedArrayArg; }); /** * pushes the real Dockerfile images to a Docker registry */ exports.pushDockerfiles = (sortedArrayArg) => __awaiter(this, void 0, void 0, function* () { - sortedArrayArg.forEach((dockerfileArg) => __awaiter(this, void 0, void 0, function* () { + for (let dockerfileArg of sortedArrayArg) { yield dockerfileArg.push(NpmciEnv.buildStage); - })); + } return sortedArrayArg; }); /** @@ -114,9 +112,9 @@ exports.pushDockerfiles = (sortedArrayArg) => __awaiter(this, void 0, void 0, fu * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages. */ exports.pullDockerfileImages = (sortableArrayArg, registryArg = 'registry.gitlab.com') => __awaiter(this, void 0, void 0, function* () { - sortableArrayArg.forEach((dockerfileArg) => __awaiter(this, void 0, void 0, function* () { + for (let dockerfileArg of sortableArrayArg) { yield dockerfileArg.pull(registryArg); - })); + } return sortableArrayArg; }); /** @@ -124,9 +122,9 @@ exports.pullDockerfileImages = (sortableArrayArg, registryArg = 'registry.gitlab * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd */ exports.testDockerfiles = (sortedArrayArg) => __awaiter(this, void 0, void 0, function* () { - sortedArrayArg.forEach((dockerfileArg) => __awaiter(this, void 0, void 0, function* () { + for (let dockerfileArg of sortedArrayArg) { yield dockerfileArg.test(); - })); + } return sortedArrayArg; }); /** @@ -158,6 +156,7 @@ class Dockerfile { plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag); yield npmci_bash_1.bashBare('docker build -t ' + this.buildTag + ' -f ' + this.filePath + ' .'); NpmciEnv.dockerFilesBuilt.push(this); + return; }); } ; @@ -277,4 +276,4 @@ exports.cleanTagsArrayFunction = function (dockerfileArrayArg, trackingArrayArg) }); return cleanTagsArray; }; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"npmci.build.docker.js","sourceRoot":"","sources":["../ts/npmci.build.docker.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"npmci.build.docker.js","sourceRoot":"","sources":["../ts/npmci.build.docker.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAA0C;AAC1C,uCAAsC;AACtC,wCAAuC;AACvC,6CAAuC;AAEvC;;GAEG;AACQ,QAAA,KAAK,GAAG;IACjB,MAAM,uBAAe,EAAE;SACpB,IAAI,CAAC,uBAAe,CAAC;SACrB,IAAI,CAAC,sBAAc,CAAC;SACpB,IAAI,CAAC,wBAAgB,CAAC;SACtB,IAAI,CAAC,uBAAe,CAAC,CAAA;AAC1B,CAAC,CAAA,CAAA;AAED;;;GAGG;AACQ,QAAA,eAAe,GAAG;IAC3B,IAAI,QAAQ,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,EAAE,eAAe,CAAC,CAAA;IAElF,8BAA8B;IAC9B,IAAI,oBAAoB,GAAiB,EAAE,CAAA;IAC3C,GAAG,CAAC,CAAC,IAAI,cAAc,IAAI,QAAQ,CAAC,CAAC,CAAC;QACpC,IAAI,YAAY,GAAG,IAAI,UAAU,CAAC;YAChC,QAAQ,EAAE,cAAc;YACxB,IAAI,EAAE,IAAI;SACX,CAAC,CAAA;QACF,oBAAoB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;IACzC,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAA;AAE7B,CAAC,CAAA,CAAA;AAED;;;;GAIG;AACQ,QAAA,eAAe,GAAG,CAAC,gBAA8B;IAC1D,IAAI,IAAI,GAAG,OAAO,CAAC,CAAC,CAAC,KAAK,EAAgB,CAAA;IAC1C,IAAI,WAAW,GAAiB,EAAE,CAAA;IAClC,IAAI,iBAAiB,GAAG,8BAAsB,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAA;IAC7E,IAAI,qBAAqB,GAAW,CAAC,CAAA;IACrC,IAAI,cAAc,GAAG;QACnB,gBAAgB,CAAC,OAAO,CAAC,CAAC,aAAa;YACrC,IAAI,SAAS,GAAG,8BAAsB,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAA;YACrE,EAAE,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnG,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;YACjC,CAAC;YAAA,CAAC;YACF,EAAE,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC9D,aAAa,CAAC,uBAAuB,GAAG,IAAI,CAAA;YAC9C,CAAC;YAAA,CAAC;QACJ,CAAC,CAAC,CAAA;QACF,EAAE,CAAC,CAAC,gBAAgB,CAAC,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;YACnD,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAA;QAC3B,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,qBAAqB,GAAG,EAAE,CAAC,CAAC,CAAC;YACtC,qBAAqB,EAAE,CAAA;YACvB,cAAc,EAAE,CAAA;QAClB,CAAC;QAAA,CAAC;IACJ,CAAC,CAAA;IACD,cAAc,EAAE,CAAA;IAChB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAA;AACrB,CAAC,CAAA;AAED;;GAEG;AACQ,QAAA,cAAc,GAAG,CAAO,WAAyB;IAC1D,WAAW,CAAC,OAAO,CAAC,CAAC,aAAa;QAChC,EAAE,CAAC,CAAC,aAAa,CAAC,uBAAuB,CAAC,CAAC,CAAC;YAC1C,WAAW,CAAC,OAAO,CAAC,CAAC,SAAqB;gBACxC,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,KAAK,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;oBACnD,aAAa,CAAC,mBAAmB,GAAG,SAAS,CAAA;gBAC/C,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QAAA,CAAC;IACJ,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,WAAW,CAAA;AACpB,CAAC,CAAA,CAAA;AAED;;GAEG;AACQ,QAAA,gBAAgB,GAAG,CAAO,cAA4B;IAC/D,GAAG,CAAC,CAAC,IAAI,aAAa,IAAI,cAAc,CAAC,CAAC,CAAC;QACzC,MAAM,aAAa,CAAC,KAAK,EAAE,CAAA;IAC7B,CAAC;IACD,MAAM,CAAC,cAAc,CAAA;AACvB,CAAC,CAAA,CAAA;AAED;;GAEG;AACQ,QAAA,eAAe,GAAG,CAAO,cAA4B;IAC9D,GAAG,CAAC,CAAC,IAAI,aAAa,IAAI,cAAc,CAAC,CAAC,CAAC;QACzC,MAAM,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAA;IAC/C,CAAC;IACD,MAAM,CAAC,cAAc,CAAA;AACvB,CAAC,CAAA,CAAA;AAED;;;GAGG;AACQ,QAAA,oBAAoB,GAAG,CAAO,gBAA8B,EAAE,WAAW,GAAG,qBAAqB;IAC1G,GAAG,CAAC,CAAC,IAAI,aAAa,IAAI,gBAAgB,CAAC,CAAC,CAAC;QAC3C,MAAM,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACvC,CAAC;IACD,MAAM,CAAC,gBAAgB,CAAA;AACzB,CAAC,CAAA,CAAA;AAED;;;GAGG;AACQ,QAAA,eAAe,GAAG,CAAO,cAA4B;IAC9D,GAAG,CAAC,CAAC,IAAI,aAAa,IAAI,cAAc,CAAC,CAAC,CAAC;QACzC,MAAM,aAAa,CAAC,IAAI,EAAE,CAAA;IAC5B,CAAC;IACD,MAAM,CAAC,cAAc,CAAA;AACvB,CAAC,CAAA,CAAA;AAED;;GAEG;AACH;IAaE,YAAY,OAA8E;QACxF,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;QAChC,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAA;QACzD,IAAI,CAAC,OAAO,GAAG,yBAAiB,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAA;QAC3E,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,CAAA;QAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;QAC7B,IAAI,CAAC,OAAO,GAAG,iBAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAChF,IAAI,CAAC,UAAU,GAAG,iBAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAA;QAC7E,IAAI,CAAC,aAAa,GAAG,aAAa,GAAG,IAAI,CAAC,OAAO,CAAA;QACjD,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YACrC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAA;QAC1F,CAAC;QAAA,CAAC;QACF,IAAI,CAAC,SAAS,GAAG,uBAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC9C,IAAI,CAAC,uBAAuB,GAAG,KAAK,CAAA;IACtC,CAAC;IAAA,CAAC;IAEF;;OAEG;IACG,KAAK;;YACT,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,8BAA8B,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;YACtE,MAAM,qBAAQ,CAAC,kBAAkB,GAAG,IAAI,CAAC,QAAQ,GAAG,MAAM,GAAG,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAA;YAClF,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACpC,MAAM,CAAA;QACR,CAAC;KAAA;IAAA,CAAC;IAEF;;OAEG;IACG,IAAI,CAAC,QAAQ;;YACjB,IAAI,OAAO,CAAA;YACX,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACjB,KAAK,SAAS;oBACZ,OAAO,GAAG,IAAI,CAAC,UAAU,CAAA;oBACzB,KAAK,CAAA;gBACP,KAAK,MAAM,CAAC;gBACZ;oBACE,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;oBACtB,KAAK,CAAA;YACT,CAAC;YACD,MAAM,qBAAQ,CAAC,aAAa,GAAG,IAAI,CAAC,QAAQ,GAAG,GAAG,GAAG,OAAO,CAAC,CAAA;YAC7D,MAAM,qBAAQ,CAAC,cAAc,GAAG,OAAO,CAAC,CAAA;QAC1C,CAAC;KAAA;IAAA,CAAC;IAEF;;OAEG;IACG,IAAI,CAAC,WAAmB;;YAC5B,IAAI,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;YAC1B,MAAM,qBAAQ,CAAC,cAAc,GAAG,OAAO,CAAC,CAAA;YACxC,MAAM,qBAAQ,CAAC,aAAa,GAAG,OAAO,GAAG,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/D,CAAC;KAAA;IAAA,CAAC;IAEF;;OAEG;IACG,IAAI;;YACR,IAAI,QAAQ,GAAW,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,OAAO,GAAG,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,CAAA;YAC5F,IAAI,cAAc,GAAY,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;YAC3E,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC;gBACnB,YAAY;gBACZ,MAAM,qBAAQ,CAAC,yCAAyC,GAAG,IAAI,CAAC,QAAQ,GAAG,oBAAoB,CAAC,CAAA;gBAChG,MAAM,qBAAQ,CAAC,YAAY,GAAG,QAAQ,GAAG,2CAA2C,CAAC,CAAA;gBACrF,MAAM,qBAAQ,CAAC,qDAAqD,CAAC,CAAA;gBACrE,MAAM,qBAAQ,CAAC,oDAAoD,CAAC,CAAA;gBACpE,MAAM,qBAAQ,CAAC,gCAAgC,CAAC,CAAA;gBAChD,MAAM,qBAAQ,CAAC,qCAAqC,CAAC,CAAA;YACvD,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,QAAQ,GAAG,iCAAiC,CAAC,CAAA;YACnG,CAAC;QACH,CAAC;KAAA;IAAA,CAAC;IAEF;;OAEG;IACG,KAAK;;YACT,IAAI,WAAW,GAAG,MAAM,qBAAQ,CAAC,mDAAmD,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAA;YACrG,MAAM,CAAC,WAAW,CAAA;QACpB,CAAC;KAAA;IAAA,CAAC;CACH;AA5FD,gCA4FC;AAED;;;GAGG;AACQ,QAAA,iBAAiB,GAAG,CAAC,iBAAyB;IACvD,IAAI,aAAqB,CAAA;IACzB,IAAI,YAAY,GAAG,8BAA8B,CAAA;IACjD,IAAI,gBAAgB,GAAG,YAAY,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAA;IAC3D,EAAE,CAAC,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;QACtD,aAAa,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAA;IACrC,CAAC;IAAC,IAAI,CAAC,CAAC;QACN,aAAa,GAAG,QAAQ,CAAA;IAC1B,CAAC;IACD,MAAM,CAAC,aAAa,CAAA;AACtB,CAAC,CAAA;AAED;;GAEG;AACQ,QAAA,eAAe,GAAG,UAAU,oBAA4B;IACjE,IAAI,cAAc,GAAG,+BAA+B,CAAA;IACpD,IAAI,gBAAgB,GAAG,cAAc,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAChE,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAA;AAC5B,CAAC,CAAA;AAED;;GAEG;AACQ,QAAA,SAAS,GAAG,UAAU,WAAmB,EAAE,OAAe,EAAE,UAAkB,EAAE,SAAkB;IAC3G,IAAI,SAAiB,CAAA;IACrB,IAAI,QAAQ,GAAG,WAAW,CAAA;IAC1B,IAAI,IAAI,GAAG,OAAO,CAAA;IAClB,IAAI,OAAO,GAAG,UAAU,CAAA;IACxB,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QACd,OAAO,GAAG,UAAU,GAAG,GAAG,GAAG,SAAS,CAAA;IACxC,CAAC;IAAA,CAAC;IACF,SAAS,GAAG,QAAQ,GAAG,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,OAAO,CAAA;IACjD,MAAM,CAAC,SAAS,CAAA;AAClB,CAAC,CAAA;AAED;;GAEG;AACQ,QAAA,sBAAsB,GAAG,UAAU,kBAAgC,EAAE,gBAA8B;IAC5G,IAAI,cAAc,GAAa,EAAE,CAAA;IACjC,kBAAkB,CAAC,OAAO,CAAC,UAAU,aAAa;QAChD,EAAE,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACnD,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;QAC7C,CAAC;IACH,CAAC,CAAC,CAAA;IACF,MAAM,CAAC,cAAc,CAAA;AACvB,CAAC,CAAA"} \ No newline at end of file diff --git a/dist/npmci.plugins.d.ts b/dist/npmci.plugins.d.ts index 04945ca..e31bfc4 100644 --- a/dist/npmci.plugins.d.ts +++ b/dist/npmci.plugins.d.ts @@ -8,6 +8,7 @@ export import projectinfo = require('projectinfo'); export import q = require('smartq'); export declare let request: any; export import smartcli = require('smartcli'); +export import smartdelay = require('smartdelay'); export import smartfile = require('smartfile'); export import shelljs = require('shelljs'); export import smartparam = require('smartparam'); diff --git a/dist/npmci.plugins.js b/dist/npmci.plugins.js index ad661b4..cb20b2a 100644 --- a/dist/npmci.plugins.js +++ b/dist/npmci.plugins.js @@ -10,6 +10,7 @@ exports.projectinfo = require("projectinfo"); exports.q = require("smartq"); exports.request = require('request'); exports.smartcli = require("smartcli"); +exports.smartdelay = require("smartdelay"); exports.smartfile = require("smartfile"); exports.shelljs = require("shelljs"); exports.smartparam = require("smartparam"); @@ -19,4 +20,4 @@ exports.smartsocket = require("smartsocket"); exports.smartssh = require("smartssh"); exports.smartstring = require("smartstring"); exports.through2 = require("through2"); -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBOEM7QUFDbkMsUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBQ2pDLGdEQUFxRDtBQUMxQyxRQUFBLE1BQU0sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7QUFDckMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyw2Q0FBa0Q7QUFDbEQsOEJBQW1DO0FBQ3hCLFFBQUEsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUN2Qyx1Q0FBNEM7QUFDNUMseUNBQThDO0FBQzlDLHFDQUEwQztBQUMxQywyQ0FBZ0Q7QUFDaEQsbUNBQXdDO0FBQ3hDLDJDQUFnRDtBQUNoRCw2Q0FBa0Q7QUFDbEQsdUNBQTRDO0FBQzVDLDZDQUFrRDtBQUNsRCx1Q0FBNEMifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibnBtY2kucGx1Z2lucy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL25wbWNpLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5Q0FBOEM7QUFDbkMsUUFBQSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBQ2pDLGdEQUFxRDtBQUMxQyxRQUFBLE1BQU0sR0FBRyxPQUFPLENBQUMsUUFBUSxDQUFDLENBQUE7QUFDckMsdUNBQTRDO0FBQzVDLCtCQUFvQztBQUNwQyw2Q0FBa0Q7QUFDbEQsOEJBQW1DO0FBQ3hCLFFBQUEsT0FBTyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtBQUN2Qyx1Q0FBNEM7QUFDNUMsMkNBQWdEO0FBQ2hELHlDQUE4QztBQUM5QyxxQ0FBMEM7QUFDMUMsMkNBQWdEO0FBQ2hELG1DQUF3QztBQUN4QywyQ0FBZ0Q7QUFDaEQsNkNBQWtEO0FBQ2xELHVDQUE0QztBQUM1Qyw2Q0FBa0Q7QUFDbEQsdUNBQTRDIn0= \ No newline at end of file diff --git a/package.json b/package.json index 50d8087..2cc6326 100644 --- a/package.json +++ b/package.json @@ -42,10 +42,11 @@ "request": "^2.81.0", "shelljs": "^0.7.7", "smartcli": "^2.0.1", + "smartdelay": "^1.0.1", "smartfile": "^4.1.7", "smartparam": "^0.1.1", "smartq": "^1.1.1", - "smartshell": "^1.0.2", + "smartshell": "^1.0.3", "smartsocket": "^1.1.7", "smartssh": "^1.2.1", "smartstring": "^2.0.24", diff --git a/ts/npmci.bash.ts b/ts/npmci.bash.ts index 96c4547..e39adf3 100644 --- a/ts/npmci.bash.ts +++ b/ts/npmci.bash.ts @@ -72,6 +72,7 @@ export let bash = async (commandArg: string, retryArg: number = 2, bareArg: bool } } else { plugins.beautylog.log('ShellExec would be: ' + commandArg) + await plugins.smartdelay.delayFor(100) execResult = { exitCode: 0, stdout: 'testOutput' @@ -83,7 +84,7 @@ export let bash = async (commandArg: string, retryArg: number = 2, bareArg: bool /** * bashBare allows usage of bash without sourcing any files like nvm */ -export let bashBare = async(commandArg: string, retryArg: number = 2): Promise => { +export let bashBare = async (commandArg: string, retryArg: number = 2): Promise => { return await bash(commandArg, retryArg, true) } diff --git a/ts/npmci.build.docker.ts b/ts/npmci.build.docker.ts index c1bcf3d..26895e2 100644 --- a/ts/npmci.build.docker.ts +++ b/ts/npmci.build.docker.ts @@ -86,9 +86,9 @@ export let mapDockerfiles = async (sortedArray: Dockerfile[]): Promise { - sortedArrayArg.forEach(async function (dockerfileArg) { + for (let dockerfileArg of sortedArrayArg) { await dockerfileArg.build() - }) + } return sortedArrayArg } @@ -96,9 +96,9 @@ export let buildDockerfiles = async (sortedArrayArg: Dockerfile[]) => { * pushes the real Dockerfile images to a Docker registry */ export let pushDockerfiles = async (sortedArrayArg: Dockerfile[]) => { - sortedArrayArg.forEach(async (dockerfileArg) => { + for (let dockerfileArg of sortedArrayArg) { await dockerfileArg.push(NpmciEnv.buildStage) - }) + } return sortedArrayArg } @@ -107,9 +107,9 @@ export let pushDockerfiles = async (sortedArrayArg: Dockerfile[]) => { * This is needed if building, testing, and publishing of Docker images is carried out in seperate CI stages. */ export let pullDockerfileImages = async (sortableArrayArg: Dockerfile[], registryArg = 'registry.gitlab.com') => { - sortableArrayArg.forEach(async (dockerfileArg) => { + for (let dockerfileArg of sortableArrayArg) { await dockerfileArg.pull(registryArg) - }) + } return sortableArrayArg } @@ -118,9 +118,9 @@ export let pullDockerfileImages = async (sortableArrayArg: Dockerfile[], registr * @param sortedArrayArg Dockerfile[] that contains all Dockerfiles in cwd */ export let testDockerfiles = async (sortedArrayArg: Dockerfile[]) => { - sortedArrayArg.forEach(async (dockerfileArg) => { + for (let dockerfileArg of sortedArrayArg) { await dockerfileArg.test() - }) + } return sortedArrayArg } @@ -163,6 +163,7 @@ export class Dockerfile { plugins.beautylog.info('now building Dockerfile for ' + this.cleanTag) await bashBare('docker build -t ' + this.buildTag + ' -f ' + this.filePath + ' .') NpmciEnv.dockerFilesBuilt.push(this) + return }; /** diff --git a/ts/npmci.plugins.ts b/ts/npmci.plugins.ts index d94f503..0b7b904 100644 --- a/ts/npmci.plugins.ts +++ b/ts/npmci.plugins.ts @@ -8,6 +8,7 @@ export import projectinfo = require('projectinfo') export import q = require('smartq') export let request = require('request') export import smartcli = require('smartcli') +export import smartdelay = require('smartdelay') export import smartfile = require('smartfile') export import shelljs = require('shelljs') export import smartparam = require('smartparam') diff --git a/yarn.lock b/yarn.lock index 1eba796..066c885 100644 --- a/yarn.lock +++ b/yarn.lock @@ -22,11 +22,7 @@ version "2.1.5" resolved "https://registry.yarnpkg.com/@types/js-base64/-/js-base64-2.1.5.tgz#31b6d36a66a4c59ae3f31b5e16bfd6b832a6eb41" -"@types/lodash@4.x.x", "@types/lodash@^4.14.35": - version "4.14.52" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.52.tgz#de5c7ab14da1289733233c9b0ec6f9e377db90f5" - -"@types/lodash@^4.14.55": +"@types/lodash@4.x.x", "@types/lodash@^4.14.35", "@types/lodash@^4.14.55": version "4.14.55" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.55.tgz#75d7d4eba020ee4103d4cbd0f2a3ef5db8f7534f" @@ -42,11 +38,7 @@ version "2.2.39" resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-2.2.39.tgz#f68d63db8b69c38e9558b4073525cf96c4f7a829" -"@types/node@*": - version "7.0.5" - resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.5.tgz#96a0f0a618b7b606f1ec547403c00650210bfbb7" - -"@types/node@^7.0.8": +"@types/node@*", "@types/node@^7.0.8": version "7.0.8" resolved "https://registry.yarnpkg.com/@types/node/-/node-7.0.8.tgz#25e4dd804b630c916ae671233e6d71f6ce18124a" @@ -284,20 +276,7 @@ beautylog@^5.0.23: smartenv "^1.2.5" typings-global "^1.0.13" -beautylog@^6.0.0, beautylog@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/beautylog/-/beautylog-6.1.1.tgz#2a83603ad7e2a0a09701ac63d7d3064a588dc779" - dependencies: - "@types/lodash" "4.x.x" - beautycolor "^1.0.5" - figlet "^1.2.0" - lodash "^4.17.4" - ora "^1.1.0" - smartenv "^2.0.0" - smartq "^1.0.4" - typings-global "^1.0.14" - -beautylog@^6.1.3: +beautylog@^6.0.0, beautylog@^6.1.1, beautylog@^6.1.3: version "6.1.3" resolved "https://registry.yarnpkg.com/beautylog/-/beautylog-6.1.3.tgz#0e8640cc429746b1e0c46e8767e9273b6b1902f1" dependencies: @@ -2147,15 +2126,7 @@ set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" -shelljs@^0.7.4, shelljs@^0.7.5: - version "0.7.6" - resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.6.tgz#379cccfb56b91c8601e4793356eb5382924de9ad" - dependencies: - glob "^7.0.0" - interpret "^1.0.0" - rechoir "^0.6.2" - -shelljs@^0.7.6, shelljs@^0.7.7: +shelljs@^0.7.4, shelljs@^0.7.5, shelljs@^0.7.6, shelljs@^0.7.7: version "0.7.7" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.7.tgz#b2f5c77ef97148f4b4f6e22682e10bba8667cff1" dependencies: @@ -2227,6 +2198,12 @@ smartcli@^2.0.1: typings-global "^1.0.14" yargs "^6.4.0" +smartdelay@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/smartdelay/-/smartdelay-1.0.1.tgz#687f8bcc09d7c62c9c5a8a1771c1aba3aff54156" + dependencies: + typings-global "^1.0.14" + smartenv@^1.2.2, smartenv@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/smartenv/-/smartenv-1.2.5.tgz#5e50343ec4653953ef24929fc548cd74ea53205c" @@ -2244,7 +2221,7 @@ smartenv@^2.0.0: q "^1.4.1" typings-global "^1.0.14" -smartfile@4.1.6, smartfile@^4.0.21, smartfile@^4.1.0: +smartfile@4.1.6: version "4.1.6" resolved "https://registry.yarnpkg.com/smartfile/-/smartfile-4.1.6.tgz#d71026aefef99233c56766c3c6c11afc41a19b3a" dependencies: @@ -2261,7 +2238,7 @@ smartfile@4.1.6, smartfile@^4.0.21, smartfile@^4.1.0: vinyl "^2.0.1" vinyl-file "^3.0.0" -smartfile@^4.1.7: +smartfile@^4.0.21, smartfile@^4.1.0, smartfile@^4.1.7: version "4.1.7" resolved "https://registry.yarnpkg.com/smartfile/-/smartfile-4.1.7.tgz#5657bea62ad673d891b2c9a00f5866154e768c3f" dependencies: @@ -2309,9 +2286,9 @@ smartrequest@^1.0.4: smartq "^1.1.0" typings-global "^1.0.14" -smartshell@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/smartshell/-/smartshell-1.0.2.tgz#b05b8ea6b5ea7191f577028f96bf961c26302182" +smartshell@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/smartshell/-/smartshell-1.0.3.tgz#a921fed84783fd840e87d74964d8b4ca84f44998" dependencies: "@types/shelljs" "^0.6.0" shelljs "^0.7.6"