Change build stamp again by having it use only VERSION file on master branch
This will have it show "3.2.0-dev-HASH" on master even though there is
no "3.2.0-dev" git tag.
(cherry picked from commit 8e5a2e730da70b8a8f597c7fba9bc328e0d89546)
diff --git a/build/packager.js b/build/packager.js
index 6c325c4..39bfcce 100644
--- a/build/packager.js
+++ b/build/packager.js
@@ -30,9 +30,10 @@
callback(cachedGitVersion);
return;
}
- if (fs.existsSync('.git')) {
+ var versionFileId = fs.readFileSync('VERSION', { encoding: 'utf8' }).trim();
+ if (/-dev$/.test(versionFileId) && fs.existsSync('.git')) {
var gitPath = 'git';
- var args = 'describe --tags';
+ var args = 'rev-list HEAD --max-count=1 --abbrev-commit';
childProcess.exec(gitPath + ' ' + args, function(err, stdout, stderr) {
var isWindows = process.platform.slice(0, 3) == 'win';
if (err && isWindows) {
@@ -41,13 +42,13 @@
if (err) {
error(err);
} else {
- done(stdout);
+ done(versionFileId + '-' + stdout);
}
});
} else if (err) {
error(err);
} else {
- done(stdout);
+ done(versionFileId + '-' + stdout);
}
});
} else {
