@soft-artel/ci 1.4.41 → 1.4.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/libs/Git.js +1 -1
- package/libs/Git.js.map +1 -1
- package/package.json +1 -1
- package/xcode.js +6 -4
- package/xcode.js.map +1 -1
package/libs/Git.js
CHANGED
|
@@ -42,7 +42,7 @@ function setOrigin(opts = {}) {
|
|
|
42
42
|
return;
|
|
43
43
|
}
|
|
44
44
|
let url = opts.url || ENV.CI_PROJECT_URL || '';
|
|
45
|
-
url = url.replace('https://', `https://gitlab:${ENV.
|
|
45
|
+
url = url.replace('https://', `https://gitlab:${ENV.GITLAB_PASS}@`);
|
|
46
46
|
yield Shell_1.default.exec(`git remote set-url --push origin ${url}.git`);
|
|
47
47
|
yield Shell_1.default.exec(`git remote set-url origin ${url}.git`);
|
|
48
48
|
});
|
package/libs/Git.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Git.js","sourceRoot":"","sources":["../../libs/Git.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,oDAA4B;AAE5B,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;AAIxB,MAAM,MAAM;IAQX,YAAY,GAAW,EAAE,QAAgB;QANzC,SAAI,GAAI,IAAI,IAAI,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,GAAI,CAAC,CAAC,CAAC;QACpD,QAAG,GAAK,GAAG,CAAC,aAAa,IAAI,EAAE,CAAC;QAChC,QAAG,GAAK,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC;QACpC,SAAI,GAAI,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;QACnC,UAAK,GAAG,GAAG,CAAC,gBAAgB,IAAI,EAAE,CAAC;QAGlC,IAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAC;YACpB,OAAO;SACP;QAED,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAEjC,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1C,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACnB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACrB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,GAAG,GAAI,IAAI,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,UAAU;QACb,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACvD,OAAO,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;IAC1E,CAAC;CAED;AAKD,SAAe,SAAS,CAAC,OAAwC,EAAE;;QAClE,IAAG,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,CAAC,SAAS,EAAC;YAEhC,OAAO;SACP;QAED,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,cAAc,IAAI,EAAE,CAAC;QAE/C,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,kBAAmB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"Git.js","sourceRoot":"","sources":["../../libs/Git.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/xcode.js
CHANGED
|
@@ -31,10 +31,12 @@ function main() {
|
|
|
31
31
|
.option('--debug', 'Output extra debugging info')
|
|
32
32
|
.action(() => __awaiter(this, void 0, void 0, function* () {
|
|
33
33
|
let reporter;
|
|
34
|
+
const opts = commander_1.program.opts() || {};
|
|
35
|
+
const workPath = (0, helpers_1.resolvePath)(opts.path || ENV.CI_PROJECT_DIR || Shell_1.default.pwd().toString());
|
|
34
36
|
try {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
37
|
+
if (opts.sudo) {
|
|
38
|
+
yield (0, helpers_1.fillEnvVarsFromFile)(`${workPath}/.env`);
|
|
39
|
+
}
|
|
38
40
|
(0, helpers_1.checkEnvVars)(['SECRETS', 'REPORTER']);
|
|
39
41
|
const prj = new Project_1.Project(workPath, opts.stage);
|
|
40
42
|
const reporterOpts = JSON.parse(ENV.REPORTER);
|
|
@@ -99,9 +101,9 @@ function run(prj, reporter, opts) {
|
|
|
99
101
|
}, { verbose: '' });
|
|
100
102
|
const release = yield Jira_1.Jira.resolve(prj);
|
|
101
103
|
yield reporter.append(` + Resolved tasks:${release.tasks.length}, bugs: ${release.bugs.length}`);
|
|
104
|
+
yield Git_1.default.setOrigin();
|
|
102
105
|
yield Shell_1.default.exec(`git reset --hard HEAD`, { silent: false });
|
|
103
106
|
yield prj.updateChangeLog(release.changelog);
|
|
104
|
-
yield Git_1.default.setOrigin();
|
|
105
107
|
yield Shell_1.default.exec(`git commit -a -m "v${prj.version}"`, { ignoreError: true, silent: false });
|
|
106
108
|
yield Git_1.default.push(ENV.CI_COMMIT_REF_NAME || 'dev');
|
|
107
109
|
yield reporter.append(` + Update <a href="${prj.url}/-/blob/${ENV.CI_COMMIT_REF_NAME || 'dev'}/CHANGELOG.md">changelog</a>.`);
|
package/xcode.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"xcode.js","sourceRoot":"","sources":["../xcode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,yCAAgD;AAEhD,yDAAiC;AACjC,qDAA6B;AAC7B,sCAAiC;AACjC,4CAAgG;AAChG,4CAAyC;AACzC,8CAA2C;AAG3C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;AAKxB,SAAe,IAAI;;QAElB,mBAAO;aACL,MAAM,CAAC,4BAA4B,EAAG,qDAAqD,CAAC;aAC5F,MAAM,CAAC,yBAAyB,EAAE,kCAAkC,CAAC;aACrE,MAAM,CAAC,mBAAmB,EAAE,mCAAmC,CAAC;aAChE,MAAM,CAAC,SAAS,EAAE,6BAA6B,CAAC;aAChD,MAAM,CAAC,SAAS,EAAE,6BAA6B,CAAC;aAChD,MAAM,CACN,GAAS,EAAE;YAEV,IAAI,QAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"xcode.js","sourceRoot":"","sources":["../xcode.ts"],"names":[],"mappings":"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"}
|