💚 Use - instead of + in release version

bugbakery · Feb 17, 2022 · 817ff79 · 817ff79
1 parent 203f1fb
commit 817ff79
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -36,7 +36,7 @@ jobs:
       - id: skip_check
         uses: fkirc/skip-duplicate-actions@master
         with:
-          paths: '[".github/workflows/release.yml","app/package.json","app/package-lock.json","app/electron-builder.config.js","app/src/vite_main.config.js","app/src/vite_renderer.config.js","app/src/scripts/*","server/build_server.sh","server/poetry.lock","server/pyoxidizer.bzl","server/pyproject.toml","server/requirements.txt"]'
+          paths: '[".github/workflows/release.yml","app/package.json","app/package-lock.json","app/electron-builder.config.js","app/get_version.js","app/src/vite_main.config.js","app/src/vite_renderer.config.js","app/src/scripts/*","server/build_server.sh","server/poetry.lock","server/pyoxidizer.bzl","server/pyproject.toml","server/requirements.txt"]'
 
   get_metadata:
     runs-on: ubuntu-latest

diff --git a/app/get_version.js b/app/get_version.js
@@ -8,16 +8,16 @@ function getVersion() {
     cwd: __dirname,
     encoding: 'utf-8',
   };
-  const lastBumpCommit = child_process.execSync(
-    `git log --no-patch --pretty="%H" -L /version/,+1:package.json`,
-    execOptions
-  );
+  const lastBumpCommit = child_process
+    .execSync(`git log --no-patch --pretty="%H" -L /version/,+1:package.json`, execOptions)
+    .trim()
+    .split('\n')[0];
   const commitListSinceBump = child_process.execSync(
     `git rev-list ${lastBumpCommit.trim()}..HEAD`,
     execOptions
   );
   const noCommitsSinceBump = commitListSinceBump.trim().split('\n').length;
-  return `${baseVersion}+${noCommitsSinceBump}`;
+  return `${baseVersion}-${noCommitsSinceBump}`;
 }
 
 module.exports = getVersion;
diff --git a/app/package-lock.json b/app/package-lock.json