diff --git a/Update/UpdateToRelease.js b/Update/UpdateToRelease.js index 8e651fe3..37256782 100644 --- a/Update/UpdateToRelease.js +++ b/Update/UpdateToRelease.js @@ -58,7 +58,7 @@ if (LastType == "Release") { if (LastJSVersion != NpmVersion) { console.warn("Assuming you manually ran npm version."); } else { - execSync("npm version patch"); + execSync("npm version minor"); } var CurrentVersion = execSync("jq -r '.version' package.json").toString().trim(); console.log("Current version : " + CurrentVersion); diff --git a/Update/UpdateVersion.js b/Update/UpdateVersion.js index 1992a556..1fab8e5e 100644 --- a/Update/UpdateVersion.js +++ b/Update/UpdateVersion.js @@ -14,6 +14,12 @@ var JSFileContent = readFileSync(JSFileName, "utf8"); execSync("git config --global user.email \"github-actions[bot]@users.noreply.github.com\""); execSync("git config --global user.name \"github-actions[bot]\""); if (JSONFileContent.includes('//!ci-no-touch')) { + var updatedContent = JSONFileContent.replace('//!ci-no-touch', ''); + writeFileSync(JSONFileName, updatedContent, "utf8"); + execSync("git config pull.rebase false"); + execSync("git pull"); + execSync("git commit -a -m \"remove //!ci-no-touch\""); + execSync("git push -f"); console.log('I won\'t touch this. Exiting process.'); process.exit(0); }