Fix version in commit string not being replaced. Align versioning sch…

…eme with other plugins
intuit · Dec 22, 2021 · 59292fb · 59292fb
1 parent 475950b
commit 59292fb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/plugins/version-file/__tests__/version-file.test.ts b/plugins/version-file/__tests__/version-file.test.ts
@@ -76,8 +76,8 @@ describe("Version File Write Operations", () => {
     await hooks.version.promise({bump: SEMVER.major})
     expect(fs.readFileSync("VERSION", "utf-8")).toStrictEqual("2.0.0")
     // check that the proper git operations were performed
-    expect(execPromise).toHaveBeenNthCalledWith(1, "git", ["commit", "-am", "'\"Bump version to: %s [skip ci]\"'"]);
-    expect(execPromise).toHaveBeenNthCalledWith(2, "git", ["tag", "2.0.0"]);
+    expect(execPromise).toHaveBeenNthCalledWith(1, "git", ["commit", "-am", "Bump version to: v2.0.0 [skip ci]"]);
+    expect(execPromise).toHaveBeenNthCalledWith(2, "git", ["tag", "v2.0.0"]);
   });
 
   test("It should version the file properly for minor releases", async () => {
@@ -97,8 +97,8 @@ describe("Version File Write Operations", () => {
     await hooks.version.promise({bump: SEMVER.minor})
     expect(fs.readFileSync("VERSION", "utf-8")).toStrictEqual("1.1.0");
     // check that the proper git operations were performed
-    expect(execPromise).toHaveBeenNthCalledWith(1, "git", ["commit", "-am", "'\"Bump version to: %s [skip ci]\"'"]);
-    expect(execPromise).toHaveBeenNthCalledWith(2, "git", ["tag", "1.1.0"]);
+    expect(execPromise).toHaveBeenNthCalledWith(1, "git", ["commit", "-am", "Bump version to: v1.1.0 [skip ci]"]);
+    expect(execPromise).toHaveBeenNthCalledWith(2, "git", ["tag", "v1.1.0"]);
   });
 
   test("It should version the file properly for patch releases", async () => {
@@ -118,8 +118,8 @@ describe("Version File Write Operations", () => {
     await hooks.version.promise({bump: SEMVER.patch})
     expect(fs.readFileSync("VERSION", "utf-8")).toStrictEqual("1.0.1");
     // check that the proper git operations were performed
-    expect(execPromise).toHaveBeenNthCalledWith(1, "git", ["commit", "-am", "'\"Bump version to: %s [skip ci]\"'"]);
-    expect(execPromise).toHaveBeenNthCalledWith(2, "git", ["tag", "1.0.1"]);
+    expect(execPromise).toHaveBeenNthCalledWith(1, "git", ["commit", "-am", "Bump version to: v1.0.1 [skip ci]"]);
+    expect(execPromise).toHaveBeenNthCalledWith(2, "git", ["tag", "v1.0.1"]);
   });
 })
 

diff --git a/plugins/version-file/src/index.ts b/plugins/version-file/src/index.ts
@@ -4,7 +4,6 @@ import * as t from "io-ts";
 import * as fs from "fs";
 import { inc, ReleaseType } from "semver";
 
-const VERSION_COMMIT_MESSAGE = `'"Bump version to: %s [skip ci]"'`;
 const readFile = promisify(fs.readFile);
 const writeFile = promisify(fs.writeFile);
 
@@ -97,10 +96,10 @@ export default class VersionFilePlugin implements IPlugin {
       if (newVersion){
         // Seal versions via commit and tag
         await writeNewVersion(auto, newVersion, this.versionFile)
-        await execPromise("git", ["commit", "-am", VERSION_COMMIT_MESSAGE]);
+        await execPromise("git", ["commit", "-am", `Bump version to: v${newVersion} [skip ci]`]);
         await execPromise("git", [
           "tag",
-          newVersion
+          `v${newVersion}`
         ]);
         auto.logger.verbose.info("Successfully versioned repo");
       } else {