@salesforce/plugin-release-management 3.16.0 → 3.16.1
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.
|
@@ -32,6 +32,7 @@ class AutoMerge extends sf_plugins_core_1.SfCommand {
|
|
|
32
32
|
this.styledJSON(prData);
|
|
33
33
|
throw new core_2.SfError(`CANNOT MERGE: ${reason}`, 'AUTOMERGE_FAILURE', [
|
|
34
34
|
'Run with --verbose to see PR response object',
|
|
35
|
+
'Also try running this locally with the "--dry-run" flag',
|
|
35
36
|
]);
|
|
36
37
|
};
|
|
37
38
|
if (prData.state !== 'open') {
|
|
@@ -44,7 +45,7 @@ class AutoMerge extends sf_plugins_core_1.SfCommand {
|
|
|
44
45
|
if (prData.user.login !== 'svc-cli-bot') {
|
|
45
46
|
stop('PR must be created by "svc-cli-bot"');
|
|
46
47
|
}
|
|
47
|
-
if (!(await this.isGreen(prData))) {
|
|
48
|
+
if (!(await this.isGreen(prData, verbose))) {
|
|
48
49
|
stop('PR checks failed');
|
|
49
50
|
}
|
|
50
51
|
if (!(await this.isMergeable())) {
|
|
@@ -65,7 +66,7 @@ class AutoMerge extends sf_plugins_core_1.SfCommand {
|
|
|
65
66
|
this.logSuccess(`Dry run successful: ${prData.number} | ${prData.title}`);
|
|
66
67
|
}
|
|
67
68
|
}
|
|
68
|
-
async isGreen(pr) {
|
|
69
|
+
async isGreen(pr, verbose) {
|
|
69
70
|
const statusResponse = await this.octokit.request('GET /repos/{owner}/{repo}/commits/{ref}/status', {
|
|
70
71
|
...this.baseRepoParams,
|
|
71
72
|
ref: pr.head.sha,
|
|
@@ -78,7 +79,9 @@ class AutoMerge extends sf_plugins_core_1.SfCommand {
|
|
|
78
79
|
...this.baseRepoParams,
|
|
79
80
|
ref: pr.head.sha,
|
|
80
81
|
});
|
|
81
|
-
if (
|
|
82
|
+
if (verbose)
|
|
83
|
+
this.styledJSON(checkRunResponse);
|
|
84
|
+
if (checkRunResponse.data.check_runs.every((cr) => cr.name === 'automerge' || (cr.status === 'completed' && ['success', 'skipped'].includes(cr.conclusion)))) {
|
|
82
85
|
return true;
|
|
83
86
|
}
|
|
84
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"automerge.js","sourceRoot":"","sources":["../../../../src/commands/cli/release/automerge.ts"],"names":[],"mappings":";;AAAA;;;;;GAKG;AACH,qJAAqJ;AACrJ,iEAA+D;AAC/D,wCAAwC;AACxC,yCAAsC;AACtC,mDAAoD;AACpD,2CAAqD;AAErD,eAAQ,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;AAE5C,MAAM,QAAQ,GAAG,eAAQ,CAAC,YAAY,CAAC,uCAAuC,EAAE,uBAAuB,CAAC,CAAC;AASzG,MAAqB,SAAU,SAAQ,2BAAe;IAoC7C,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAE9C,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,KAAK,CAAC;QAErF,MAAM,IAAI,GAAG,IAAA,uBAAY,EACvB,IAAI,SAAG,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI,IAAI,SAAG,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,EACtE,mDAAmD,CACpD,CAAC;QAEF,IAAI,CAAC,OAAO,GAAG,IAAI,cAAO,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAErC,IAAI,CAAC,cAAc,GAAG,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAEtC,IAAI,CAAC,iBAAiB,GAAG;YACvB,GAAG,IAAI,CAAC,cAAc;YACtB,WAAW,EAAE,UAAU;SACxB,CAAC;QAEF,MAAM,MAAM,GAAG,CACb,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,+CAA+C,EAAE,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAC3G,CAAC,IAAI,CAAC;QAEP,oCAAoC;QACpC,MAAM,IAAI,GAAG,CAAC,MAAc,EAAQ,EAAE;YACpC,IAAI,OAAO;gBAAE,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;YACrC,MAAM,IAAI,cAAO,CAAC,iBAAiB,MAAM,EAAE,EAAE,mBAAmB,EAAE;gBAChE,8CAA8C;
|
|
1
|
+
{"version":3,"file":"automerge.js","sourceRoot":"","sources":["../../../../src/commands/cli/release/automerge.ts"],"names":[],"mappings":"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"}
|
package/oclif.manifest.json
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@salesforce/plugin-release-management",
|
|
3
3
|
"description": "A plugin for preparing and publishing npm packages",
|
|
4
|
-
"version": "3.16.
|
|
4
|
+
"version": "3.16.1",
|
|
5
5
|
"author": "Salesforce",
|
|
6
6
|
"bugs": "https://github.com/forcedotcom/cli/issues",
|
|
7
7
|
"bin": {
|
|
@@ -290,7 +290,7 @@
|
|
|
290
290
|
}
|
|
291
291
|
},
|
|
292
292
|
"sfdx": {
|
|
293
|
-
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-release-management/3.16.
|
|
294
|
-
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-release-management/3.16.
|
|
293
|
+
"publicKeyUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-release-management/3.16.1.crt",
|
|
294
|
+
"signatureUrl": "https://developer.salesforce.com/media/salesforce-cli/security/@salesforce/plugin-release-management/3.16.1.sig"
|
|
295
295
|
}
|
|
296
296
|
}
|