More publish fixes
This commit is contained in:
Родитель
3a2f8cfacd
Коммит
1ddb201d9a
|
@ -29,13 +29,16 @@ function doPublish() {
|
|||
|
||||
let releaseVersion = pkgJson.version;
|
||||
|
||||
console.log(`Using ${`(.*-microsoft)(-${publishBranchName})?\\.([0-9]*)`} to match version`);
|
||||
const branchVersionSuffix = (publishBranchName.match(/fb.*merge/) ? `-${publishBranchName}` : '');
|
||||
|
||||
versionStringRegEx = new RegExp(`(.*-microsoft)(-${publishBranchName})?\\.([0-9]*)`);
|
||||
const versionGroups = versionStringRegEx.exec(releaseVersion);
|
||||
if (versionGroups) {
|
||||
releaseVersion = versionGroups[1] + (publishBranchName.match(/fb.*merge/) ? `-${publishBranchName}` : '') + '.' + (parseInt(versionGroups[2]) + 1);
|
||||
releaseVersion = versionGroups[1] + branchVersionSuffix + '.' + (parseInt(versionGroups[3]) + 1);
|
||||
} else {
|
||||
if (releaseVersion.indexOf("-") === -1) {
|
||||
releaseVersion = releaseVersion + "-microsoft.0";
|
||||
releaseVersion = releaseVersion + `-microsoft${branchVersionSuffix}.0`;
|
||||
} else {
|
||||
console.log("Invalid version to publish");
|
||||
exit(1);
|
||||
|
|
Загрузка…
Ссылка в новой задаче