Merge #152

152: Use version from package.json in non-development r=rehandalal a=mythmon Taskcluster doesn't build from tags, so if we pull versions from tags we don't get the right thing. This should fix that for now. Co-authored-by: Mike Cooper <[email protected]>
mozilla-extensions · May 1, 2020 · 8c08217 · 8c08217
2 parents 61be2f5 + 4705831
commit 8c08217
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/webpack.config.js b/webpack.config.js
@@ -142,12 +142,14 @@ module.exports = async (env, argv = {}) => {
 
 async function getBuildInfo(isDevelopment) {
   const rv = {
-    version: (await execOutput("git describe --dirty=-uc")).trim(),
     commitHash: (await execOutput("git rev-parse HEAD")).trim(),
   };
 
   if (isDevelopment) {
     rv.isDevelopment = true;
+    rv.version = (await execOutput("git describe --dirty=-uc")).trim();
+  } else {
+    rv.version = packageData.version;
   }
 
   if (rv.version.endsWith("-uc")) {